]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
nilfs2: deletion of an unnecessary check before the function call "iput"
authorMarkus Elfring <elfring@users.sourceforge.net>
Wed, 10 Dec 2014 23:54:31 +0000 (15:54 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 11 Dec 2014 01:41:16 +0000 (17:41 -0800)
The iput() function tests whether its argument is NULL and then returns
immediately.  Thus the test around the call is not needed.

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Signed-off-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
fs/nilfs2/the_nilfs.c

index 9da25fe9ea616d6c78d27c918649d43486c37ed6..69bd801afb53b987ea3fa862fd2a444b41d2efdb 100644 (file)
@@ -808,8 +808,7 @@ void nilfs_put_root(struct nilfs_root *root)
                spin_lock(&nilfs->ns_cptree_lock);
                rb_erase(&root->rb_node, &nilfs->ns_cptree);
                spin_unlock(&nilfs->ns_cptree_lock);
-               if (root->ifile)
-                       iput(root->ifile);
+               iput(root->ifile);
 
                kfree(root);
        }