[PATCH] kfree cleanup: fs

This is the fs/ part of the big kfree cleanup patch.

Remove pointless checks for NULL prior to calling kfree() in fs/.

Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

3 files changed, 6 insertions, 12 deletions

diff --git a/fs/nfsd/export.c b/fs/nfsd/export.c
index 057aff745506..417ec02df44f 100644
--- a/fs/nfsd/export.c
+++ b/fs/nfsd/export.c
@@ -190,8 +190,7 @@ static int expkey_parse(struct cache_detail *cd, char *mesg, int mlen)
  out:
         if (dom)
                 auth_domain_put(dom);
-        if (buf)
-                kfree(buf);
+        kfree(buf);
         return err;
 }
 
@@ -428,8 +427,7 @@ static int svc_export_parse(struct cache_detail *cd, char *mesg, int mlen)
                 path_release(&nd);
         if (dom)
                 auth_domain_put(dom);
-        if (buf)
-                kfree(buf);
+        kfree(buf);
         return err;
 }
 
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index 4c4146350236..dcd673186944 100644
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -151,8 +151,7 @@ static u32 *read_buf(struct nfsd4_compoundargs *argp, int nbytes)
         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;
@@ -2476,10 +2475,8 @@ void nfsd4_release_compoundargs(struct nfsd4_compoundargs *args)
                 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;
diff --git a/fs/nfsd/nfscache.c b/fs/nfsd/nfscache.c
index 119e4d4495b8..d852ebb538e3 100644
--- a/fs/nfsd/nfscache.c
+++ b/fs/nfsd/nfscache.c
@@ -93,8 +93,7 @@ nfsd_cache_shutdown(void)
 
         cache_disabled = 1;
 
-        if (hash_list)
-                kfree (hash_list);
+        kfree (hash_list);
         hash_list = NULL;
 }