[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>

4 files changed, 10 insertions, 20 deletions

diff --git a/fs/nfs/delegation.c b/fs/nfs/delegation.c
index 3976c177a7d0..618a327027b3 100644
--- a/fs/nfs/delegation.c
+++ b/fs/nfs/delegation.c
@@ -149,8 +149,7 @@ int nfs_inode_set_delegation(struct inode *inode, struct rpc_cred *cred, struct
                 }
         }
         spin_unlock(&clp->cl_lock);
-        if (delegation != NULL)
-                kfree(delegation);
+        kfree(delegation);
         return status;
 }
 
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
index 24d2fbf549bd..6391d8964214 100644
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
@@ -1688,8 +1688,7 @@ static void nfs_kill_super(struct super_block *s)
 
         rpciod_down();          /* release rpciod */
 
-        if (server->hostname != NULL)
-                kfree(server->hostname);
+        kfree(server->hostname);
         kfree(server);
 }
 
@@ -1908,8 +1907,7 @@ nfs_copy_user_string(char *dst, struct nfs_string *src, int maxlen)
                         return ERR_PTR(-ENOMEM);
         }
         if (copy_from_user(dst, src->data, maxlen)) {
-                if (p != NULL)
-                        kfree(p);
+                kfree(p);
                 return ERR_PTR(-EFAULT);
         }
         dst[maxlen] = '\0';
@@ -2000,10 +1998,8 @@ static struct super_block *nfs4_get_sb(struct file_system_type *fs_type,
 out_err:
         s = (struct super_block *)p;
 out_free:
-        if (server->mnt_path)
-                kfree(server->mnt_path);
-        if (server->hostname)
-                kfree(server->hostname);
+        kfree(server->mnt_path);
+        kfree(server->hostname);
         kfree(server);
         return s;
 }
@@ -2023,8 +2019,7 @@ static void nfs4_kill_super(struct super_block *sb)
 
         destroy_nfsv4_state(server);
 
-        if (server->hostname != NULL)
-                kfree(server->hostname);
+        kfree(server->hostname);
         kfree(server);
 }
 
diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
index 52a26baa114c..0675f3215e0a 100644
--- a/fs/nfs/nfs4state.c
+++ b/fs/nfs/nfs4state.c
@@ -69,10 +69,8 @@ init_nfsv4_state(struct nfs_server *server)
 void
 destroy_nfsv4_state(struct nfs_server *server)
 {
-        if (server->mnt_path) {
-                kfree(server->mnt_path);
-                server->mnt_path = NULL;
-        }
+        kfree(server->mnt_path);
+        server->mnt_path = NULL;
         if (server->nfs4_state) {
                 nfs4_put_client(server->nfs4_state);
                 server->nfs4_state = NULL;
@@ -311,8 +309,7 @@ struct nfs4_state_owner *nfs4_get_state_owner(struct nfs_server *server, struct
                 new = NULL;
         }
         spin_unlock(&clp->cl_lock);
-        if (new)
-                kfree(new);
+        kfree(new);
         if (sp != NULL)
                 return sp;
         put_rpccred(cred);
diff --git a/fs/nfs/unlink.c b/fs/nfs/unlink.c
index f732541a3332..d639d172d568 100644
--- a/fs/nfs/unlink.c
+++ b/fs/nfs/unlink.c
@@ -52,8 +52,7 @@ nfs_put_unlinkdata(struct nfs_unlinkdata *data)
 {
         if (--data->count == 0) {
                 nfs_detach_unlinkdata(data);
-                if (data->name.name != NULL)
-                        kfree(data->name.name);
+                kfree(data->name.name);
                 kfree(data);
         }
 }