[PATCH] remove redundant NULL pointer checks prior to calling kfree() in fs/nfsd/

[Jesper Juhl]

(please keep me on CC)


checking for NULL before calling kfree() is redundant and needlessly 
enlarges the kernel image, let's get rid of those checks.

Signed-off-by: Jesper Juhl <[EMAIL PROTECTED]>

--- linux-2.6.12-rc1-mm3-orig/fs/nfsd/export.c  2005-03-21 23:12:41.000000000 
+0100
+++ linux-2.6.12-rc1-mm3/fs/nfsd/export.c       2005-03-25 22:48:11.000000000 
+0100
@@ -189,8 +189,7 @@ static int expkey_parse(struct cache_det
  out:
        if (dom)
                auth_domain_put(dom);
-       if (buf)
-               kfree(buf);
+       kfree(buf);
        return err;
 }
 
@@ -426,8 +425,7 @@ static int svc_export_parse(struct cache
                path_release(&nd);
        if (dom)
                auth_domain_put(dom);
-       if (buf)
-               kfree(buf);
+       kfree(buf);
        return err;
 }
 
--- linux-2.6.12-rc1-mm3-orig/fs/nfsd/nfs4xdr.c 2005-03-25 15:28:59.000000000 
+0100
+++ linux-2.6.12-rc1-mm3/fs/nfsd/nfs4xdr.c      2005-03-25 22:49:53.000000000 
+0100
@@ -151,8 +151,7 @@ u32 *read_buf(struct nfsd4_compoundargs 
        if (nbytes <= sizeof(argp->tmp))
                p = argp->tmp;
        else {
-               if (argp->tmpp)
-                       kfree(argp->tmpp);
+               kfree(argp->tmpp);
                p = argp->tmpp = kmalloc(nbytes, GFP_KERNEL);
                if (!p)
                        return NULL;
@@ -2474,10 +2473,8 @@ void nfsd4_release_compoundargs(struct n
                kfree(args->ops);
                args->ops = args->iops;
        }
-       if (args->tmpp) {
-               kfree(args->tmpp);
-               args->tmpp = NULL;
-       }
+       kfree(args->tmpp);
+       args->tmpp = NULL;
        while (args->to_free) {
                struct tmpbuf *tb = args->to_free;
                args->to_free = tb->next;
--- linux-2.6.12-rc1-mm3-orig/fs/nfsd/nfscache.c        2005-03-21 
23:12:41.000000000 +0100
+++ linux-2.6.12-rc1-mm3/fs/nfsd/nfscache.c     2005-03-25 22:50:14.000000000 
+0100
@@ -93,8 +93,7 @@ nfsd_cache_shutdown(void)
 
        cache_disabled = 1;
 
-       if (hash_list)
-               kfree (hash_list);
+       kfree(hash_list);
        hash_list = NULL;
 }
 


-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/