2 files changed, 3 insertions, 5 deletions

diff --git a/net/sunrpc/cache.c b/net/sunrpc/cache.c
index f509e9992767..dcaa0c4453ff 100644
--- a/net/sunrpc/cache.c
+++ b/net/sunrpc/cache.c
@@ -575,12 +575,11 @@ cache_read(struct file *filp, char __user *buf, size_t count, loff_t *ppos)
         if (rp->q.list.next == &cd->queue) {
                 spin_unlock(&queue_lock);
                 up(&queue_io_sem);
-                if (rp->offset)
-                        BUG();
+                BUG_ON(rp->offset);
                 return 0;
         }
         rq = container_of(rp->q.list.next, struct cache_request, q.list);
-        if (rq->q.reader) BUG();
+        BUG_ON(rq->q.reader);
         if (rp->offset == 0)
                 rq->readers++;
         spin_unlock(&queue_lock);
diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
index e4296c8b861e..b19cc26fa9c2 100644
--- a/net/sunrpc/svc.c
+++ b/net/sunrpc/svc.c
@@ -122,8 +122,7 @@ svc_init_buffer(struct svc_rqst *rqstp, unsigned int size)
         rqstp->rq_argused = 0;
         rqstp->rq_resused = 0;
         arghi = 0;
-        if (pages > RPCSVC_MAXPAGES)
-                BUG();
+        BUG_ON(pages > RPCSVC_MAXPAGES);
         while (pages) {
                 struct page *p = alloc_page(GFP_KERNEL);
                 if (!p)