| Message ID | 20150227234958.GA12945@devel.8.8.4.4 (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 2015/2/28 7:49, Daeseok Youn wrote: > Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com> > --- > RESEND: this patch is rebased by 1/4 > > fs/ocfs2/dir.c | 8 ++------ > 1 files changed, 2 insertions(+), 6 deletions(-) > > diff --git a/fs/ocfs2/dir.c b/fs/ocfs2/dir.c > index 1478a50..c1ab24f 100644 > --- a/fs/ocfs2/dir.c > +++ b/fs/ocfs2/dir.c > @@ -1689,10 +1689,8 @@ int __ocfs2_add_entry(handle_t *handle, > if (ocfs2_dirent_would_fit(de, rec_len)) { > dir->i_mtime = dir->i_ctime = CURRENT_TIME; > retval = ocfs2_mark_inode_dirty(handle, dir, parent_fe_bh); > - if (retval < 0) { > - mlog_errno(retval); > + if (retval < 0) > goto bail; > - } > > if (insert_bh == parent_fe_bh) > retval = ocfs2_journal_access_di(handle, > @@ -1709,10 +1707,8 @@ int __ocfs2_add_entry(handle_t *handle, > retval = ocfs2_dx_dir_insert(dir, > handle, > lookup); > - if (retval) { > - mlog_errno(retval); > + if (retval) > goto bail; > - } > } > } > > IMO, these two mlogs are not "extra" because we can directly know the cause if error occurs.
OK. If i want to clean up mlog() call twice, mlog() in " bail" can be removed, right? Thanks. Regards, Daeseok Youn 2015-03-19 19:45 GMT+09:00 Joseph Qi <joseph.qi@huawei.com>: > On 2015/2/28 7:49, Daeseok Youn wrote: >> Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com> >> --- >> RESEND: this patch is rebased by 1/4 >> >> fs/ocfs2/dir.c | 8 ++------ >> 1 files changed, 2 insertions(+), 6 deletions(-) >> >> diff --git a/fs/ocfs2/dir.c b/fs/ocfs2/dir.c >> index 1478a50..c1ab24f 100644 >> --- a/fs/ocfs2/dir.c >> +++ b/fs/ocfs2/dir.c >> @@ -1689,10 +1689,8 @@ int __ocfs2_add_entry(handle_t *handle, >> if (ocfs2_dirent_would_fit(de, rec_len)) { >> dir->i_mtime = dir->i_ctime = CURRENT_TIME; >> retval = ocfs2_mark_inode_dirty(handle, dir, parent_fe_bh); >> - if (retval < 0) { >> - mlog_errno(retval); >> + if (retval < 0) >> goto bail; >> - } >> >> if (insert_bh == parent_fe_bh) >> retval = ocfs2_journal_access_di(handle, >> @@ -1709,10 +1707,8 @@ int __ocfs2_add_entry(handle_t *handle, >> retval = ocfs2_dx_dir_insert(dir, >> handle, >> lookup); >> - if (retval) { >> - mlog_errno(retval); >> + if (retval) >> goto bail; >> - } >> } >> } >> >> > IMO, these two mlogs are not "extra" because we can directly know the > cause if error occurs. >
diff --git a/fs/ocfs2/dir.c b/fs/ocfs2/dir.c index 1478a50..c1ab24f 100644 --- a/fs/ocfs2/dir.c +++ b/fs/ocfs2/dir.c @@ -1689,10 +1689,8 @@ int __ocfs2_add_entry(handle_t *handle, if (ocfs2_dirent_would_fit(de, rec_len)) { dir->i_mtime = dir->i_ctime = CURRENT_TIME; retval = ocfs2_mark_inode_dirty(handle, dir, parent_fe_bh); - if (retval < 0) { - mlog_errno(retval); + if (retval < 0) goto bail; - } if (insert_bh == parent_fe_bh) retval = ocfs2_journal_access_di(handle, @@ -1709,10 +1707,8 @@ int __ocfs2_add_entry(handle_t *handle, retval = ocfs2_dx_dir_insert(dir, handle, lookup); - if (retval) { - mlog_errno(retval); + if (retval) goto bail; - } } }
Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com> --- RESEND: this patch is rebased by 1/4 fs/ocfs2/dir.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-)