diff --git a/[refs] b/[refs]
index 2914a71fb73e..051deb44ffab 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4ea8fed593218b658927b763f02941cd16c2ed9d
+refs/heads/master: f48407ddd46bd215a7b4e1af3940e759a93640c5
diff --git a/trunk/fs/nfs/inode.c b/trunk/fs/nfs/inode.c
index 6fa01aea2488..117183b1ee09 100644
--- a/trunk/fs/nfs/inode.c
+++ b/trunk/fs/nfs/inode.c
@@ -112,8 +112,8 @@ void nfs_clear_inode(struct inode *inode)
 	/*
 	 * The following should never happen...
 	 */
-	BUG_ON(nfs_have_writebacks(inode));
-	BUG_ON(!list_empty(&NFS_I(inode)->open_files));
+	WARN_ON_ONCE(nfs_have_writebacks(inode));
+	WARN_ON_ONCE(!list_empty(&NFS_I(inode)->open_files));
 	nfs_zap_acl_cache(inode);
 	nfs_access_zap_cache(inode);
 	nfs_fscache_release_inode_cookie(inode);