p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ocfs2: remove goto statement in ocfs2_check_dir_for_entry() 

Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
Reviewed-by: Joseph Qi <joseph.qi@huawei.com>
Cc: Mark Fasheh <mfasheh@suse.com>
Cc: Joel Becker <jlbec@evilplan.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Daeseok Youn 2015-04-14 15:43:30 -07:00 committed by Linus Torvalds
parent a47726bcf2
commit 7c01ad8fe7
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fs/ocfs2/dir.c
View File

@ -2047,22 +2047,19 @@ int ocfs2_check_dir_for_entry(struct inode *dir,
const char *name,
int namelen)
{
int ret;
int ret = 0;
struct ocfs2_dir_lookup_result lookup = { NULL, };
trace_ocfs2_check_dir_for_entry(
(unsigned long long)OCFS2_I(dir)->ip_blkno, namelen, name);
if (ocfs2_find_entry(name, namelen, dir, &lookup) == 0) {
ret = -EEXIST;
if (ocfs2_find_entry(name, namelen, dir, &lookup) == 0)
goto bail;
mlog_errno(ret);
}
ret = 0;
bail:
ocfs2_free_dir_lookup_result(&lookup);
if (ret)
mlog_errno(ret);
return ret;
}