aboutsummaryrefslogtreecommitdiff
path: root/fs/nfs
diff options
context:
space:
mode:
authorTim Gardner <tim.gardner@canonical.com>2013-02-12 13:03:42 -0700
committerTrond Myklebust <Trond.Myklebust@netapp.com>2013-02-17 15:27:21 -0500
commit96aa1549afa6c79ae4a4f099de861efd218c38d8 (patch)
treee53bf6d01561b69eca6e3b893a6fed999fb13e03 /fs/nfs
parent085b7a45c63d3da5be155faab9249a5cab224561 (diff)
downloadlinux-96aa1549afa6c79ae4a4f099de861efd218c38d8.tar.gz
nfs: remove kfree() redundant null checks
smatch analysis: fs/nfs/getroot.c:130 nfs_get_root() info: redundant null check on name calling kfree() fs/nfs/unlink.c:272 nfs_async_unlink() info: redundant null check on devname_garbage calling kfree() Cc: Trond Myklebust <Trond.Myklebust@netapp.com> Cc: linux-nfs@vger.kernel.org Signed-off-by: Tim Gardner <tim.gardner@canonical.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs')
-rw-r--r--fs/nfs/getroot.c3
-rw-r--r--fs/nfs/unlink.c3
2 files changed, 2 insertions, 4 deletions
diff --git a/fs/nfs/getroot.c b/fs/nfs/getroot.c
index 033803c3664..44efaa8c5f7 100644
--- a/fs/nfs/getroot.c
+++ b/fs/nfs/getroot.c
@@ -126,8 +126,7 @@ struct dentry *nfs_get_root(struct super_block *sb, struct nfs_fh *mntfh,
}
spin_unlock(&ret->d_lock);
out:
- if (name)
- kfree(name);
+ kfree(name);
nfs_free_fattr(fsinfo.fattr);
return ret;
}
diff --git a/fs/nfs/unlink.c b/fs/nfs/unlink.c
index 13cea637eff..d26a32f5b53 100644
--- a/fs/nfs/unlink.c
+++ b/fs/nfs/unlink.c
@@ -268,8 +268,7 @@ nfs_async_unlink(struct inode *dir, struct dentry *dentry)
* point dentry is definitely not a root, so we won't need
* that anymore.
*/
- if (devname_garbage)
- kfree(devname_garbage);
+ kfree(devname_garbage);
return 0;
out_unlock:
spin_unlock(&dentry->d_lock);