From mboxrd@z Thu Jan 1 00:00:00 1970 From: Steven Whitehouse Date: Mon, 8 Dec 2014 12:38:09 +0000 Subject: [Cluster-devel] [PATCH 01/15] GFS2: directly return gfs2_dir_check() In-Reply-To: <1418042303-1536-1-git-send-email-swhiteho@redhat.com> References: <1418042303-1536-1-git-send-email-swhiteho@redhat.com> Message-ID: <1418042303-1536-2-git-send-email-swhiteho@redhat.com> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit From: Fabian Frederick No need to store gfs2_dir_check result and test it before returning. Signed-off-by: Fabian Frederick Signed-off-by: Steven Whitehouse diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c index c4ed823..b41b5c7 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); } /** -- 1.8.3.1