[KJ] [Patch] BUG_ON() conversion in fs/nfsd/

Eric Sesterhenn snakebyte at gmx.de
Sun Sep 24 15:48:16 PDT 2006


hi,

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 at gmx.de>

--- linux-2.6.18-git3/fs/nfsd/nfs4xdr.c.orig	2006-09-24 23:05:17.000000000 +0200
+++ linux-2.6.18-git3/fs/nfsd/nfs4xdr.c	2006-09-24 23:05:34.000000000 +0200
@@ -198,8 +198,7 @@ static char *savemem(struct nfsd4_compou
 		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)) {





More information about the Kernel-janitors mailing list