Merge branch 'for-3.19' of git://linux-nfs.org/~bfields/linux

[karo-tx-linux.git] / fs / nilfs2 / the_nilfs.c

diff --git a/fs/nilfs2/the_nilfs.c b/fs/nilfs2/the_nilfs.c
index 9da25fe9ea616d6c78d27c918649d43486c37ed6..69bd801afb53b987ea3fa862fd2a444b41d2efdb 100644 (file)
--- a/fs/nilfs2/the_nilfs.c
+++ b/fs/nilfs2/the_nilfs.c
@@ -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);
        }