]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
BUG_ON() conversion in fs/nfsd/
authorEric Sesterhenn <snakebyte@gmx.de>
Tue, 3 Oct 2006 21:37:14 +0000 (23:37 +0200)
committerAdrian Bunk <bunk@stusta.de>
Tue, 3 Oct 2006 21:37:14 +0000 (23:37 +0200)
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>
fs/nfsd/nfs4xdr.c

index 5446a0861d1d728ea12ee0e1faf2a52b2a19672b..5be00436b5b85b71725852e6b6b084d7dd8e6b20 100644 (file)
@@ -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)) {