aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Sesterhenn <snakebyte@gmx.de>2006-10-03 17:37:14 -0400
committerAdrian Bunk <bunk@stusta.de>2006-10-03 17:37:14 -0400
commit73dff8be9ea89df26bfb6a0443ad912de6e7bd00 (patch)
treed60d4fe0bf5026da8dccb7b9c077c501726c5f32
parent14a61442c2203d2a49f2f954bfa9259c0ddac1aa (diff)
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>
-rw-r--r--fs/nfsd/nfs4xdr.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index 5446a0861d1d..5be00436b5b8 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)
198 p = new; 198 p = new;
199 memcpy(p, argp->tmp, nbytes); 199 memcpy(p, argp->tmp, nbytes);
200 } else { 200 } else {
201 if (p != argp->tmpp) 201 BUG_ON(p != argp->tmpp);
202 BUG();
203 argp->tmpp = NULL; 202 argp->tmpp = NULL;
204 } 203 }
205 if (defer_free(argp, kfree, p)) { 204 if (defer_free(argp, kfree, p)) {