diff --git a/[refs] b/[refs]
index c2ec93718036..cc2e60b4a418 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 215c02bc33bbd5ff4d7379a909462d11f0103218
+refs/heads/master: 0f3c42f522dc1ad7e27affc0a4aa8c790bce0a66
diff --git a/trunk/mm/shmem.c b/trunk/mm/shmem.c
index dc12264f44f5..89341b658bd0 100644
--- a/trunk/mm/shmem.c
+++ b/trunk/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);
 }