Merge remote-tracking branch 'asoc/topic/wm8971' into asoc-next

[~andy/linux] / mm / shmem.c

diff --git a/mm/shmem.c b/mm/shmem.c
index dc12264f44f571ea6c88c8e2d5ad42ce1c7087bd..89341b658bd06b05d908f8becfef7fe0d904b808 100644 (file)
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -643,7 +643,7 @@ static void shmem_evict_inode(struct inode *inode)
                kfree(info->symlink);
 
        simple_xattrs_free(&info->xattrs);
-       BUG_ON(inode->i_blocks);
+       WARN_ON(inode->i_blocks);
        shmem_free_inode(inode->i_sb);
        clear_inode(inode);
 }