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:
Родитель
a47726bcf2
Коммит
7c01ad8fe7
|
@ -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);
|
||||
|
||||
ret = -EEXIST;
|
||||
if (ocfs2_find_entry(name, namelen, dir, &lookup) == 0)
|
||||
goto bail;
|
||||
if (ocfs2_find_entry(name, namelen, dir, &lookup) == 0) {
|
||||
ret = -EEXIST;
|
||||
mlog_errno(ret);
|
||||
}
|
||||
|
||||
ret = 0;
|
||||
bail:
|
||||
ocfs2_free_dir_lookup_result(&lookup);
|
||||
|
||||
if (ret)
|
||||
mlog_errno(ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче