From 7b75c71c4e326f5447e608c7bd99c52ef8e128dd Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Mon, 15 Oct 2012 16:19:30 -0400
Subject: [PATCH] --- yaml --- r: 346541 b: refs/heads/master c:
 f48407ddd46bd215a7b4e1af3940e759a93640c5 h: refs/heads/master i:   346539:
 a2270bd686569497413299973fa7f9da28d253c7 v: v3

---
 [refs]               | 2 +-
 trunk/fs/nfs/inode.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

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);