From: Eric Sesterhenn <snakebyte@gmx.de>
Date: Tue, 3 Oct 2006 21:37:14 +0000 (+0200)
Subject: BUG_ON() conversion in fs/nfsd/
X-Git-Tag: v2.6.19-rc1~165^2~4
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=73dff8be9ea89df26bfb6a0443ad912de6e7bd00;p=~emulex%2Finfiniband.git

BUG_ON() conversion in fs/nfsd/

This patch converts an if () BUG(); construct to BUG_ON();
which occupies less space, uses unlikely and is safer when
BUG() is disabled.

Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
---

diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index 5446a0861d1..5be00436b5b 100644
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -198,8 +198,7 @@ static char *savemem(struct nfsd4_compoundargs *argp, u32 *p, int nbytes)
 		p = new;
 		memcpy(p, argp->tmp, nbytes);
 	} else {
-		if (p != argp->tmpp)
-			BUG();
+		BUG_ON(p != argp->tmpp);
 		argp->tmpp = NULL;
 	}
 	if (defer_free(argp, kfree, p)) {