From c0d60a5dcaffb02a323d0fa105da11902afba4e9 Mon Sep 17 00:00:00 2001
From: Weston Andros Adamson <dros@netapp.com>
Date: Tue, 23 Oct 2012 10:43:36 -0400
Subject: [PATCH] --- yaml --- r: 346555 b: refs/heads/master c:
 0db74d9a2d2b312dd2cff066c5b97b8e626e403a h: refs/heads/master i:   346553:
 d07ef1739e6405e519235f836dfaaccc29475aba   346551:
 a77faa67df66ad08be5dea8c2981e1c0d42f535a v: v3

---
 [refs]                   | 2 +-
 trunk/net/sunrpc/cache.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 802637cc7076..22d0b4e656d4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4c9c52e479f493ccfc3f513e870912115b49058f
+refs/heads/master: 0db74d9a2d2b312dd2cff066c5b97b8e626e403a
diff --git a/trunk/net/sunrpc/cache.c b/trunk/net/sunrpc/cache.c
index fc2f7aa4dca7..9afa4393c217 100644
--- a/trunk/net/sunrpc/cache.c
+++ b/trunk/net/sunrpc/cache.c
@@ -775,11 +775,11 @@ static ssize_t cache_read(struct file *filp, char __user *buf, size_t count,
 	if (rp->q.list.next == &cd->queue) {
 		spin_unlock(&queue_lock);
 		mutex_unlock(&inode->i_mutex);
-		BUG_ON(rp->offset);
+		WARN_ON_ONCE(rp->offset);
 		return 0;
 	}
 	rq = container_of(rp->q.list.next, struct cache_request, q.list);
-	BUG_ON(rq->q.reader);
+	WARN_ON_ONCE(rq->q.reader);
 	if (rp->offset == 0)
 		rq->readers++;
 	spin_unlock(&queue_lock);