GFS2: directly return gfs2_dir_check()
authorFabian Frederick <fabf@skynet.be>
Thu, 9 Oct 2014 20:49:21 +0000 (22:49 +0200)
committerSteven Whitehouse <swhiteho@redhat.com>
Mon, 3 Nov 2014 19:23:32 +0000 (19:23 +0000)
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>
fs/gfs2/inode.c

index c4ed823d150e9609529ef1789874801180bcd4d9..b41b5c7898dae527f8a3fb2d577c5540e5b4252b 100644 (file)
@@ -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);
 }
 
 /**