summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabian Frederick <fabf@skynet.be>2014-10-09 22:49:21 +0200
committerSteven Whitehouse <swhiteho@redhat.com>2014-11-03 19:23:32 +0000
commit37975f1503715c51c1a2484b8aba2700a23e6b56 (patch)
tree9e19cdfe6f2e5516d1d4aca35d907abeaf0f3d70
parent0df1f2487d2f0d04703f142813d53615d62a1da4 (diff)
downloadlinux-37975f1503715c51c1a2484b8aba2700a23e6b56.tar.bz2
GFS2: directly return gfs2_dir_check()
No need to store gfs2_dir_check result and test it before returning. Signed-off-by: Fabian Frederick <fabf@skynet.be> Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
-rw-r--r--fs/gfs2/inode.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
index c4ed823d150e..b41b5c7898da 100644
--- a/fs/gfs2/inode.c
+++ b/fs/gfs2/inode.c
@@ -1045,11 +1045,7 @@ static int gfs2_unlink_ok(struct gfs2_inode *dip, const struct qstr *name,
if (error)
return error;
- error = gfs2_dir_check(&dip->i_inode, name, ip);
- if (error)
- return error;
-
- return 0;
+ return gfs2_dir_check(&dip->i_inode, name, ip);
}
/**