Daeseok Youn
2015-Feb-27 23:49 UTC
[Ocfs2-devel] [PATCH 2/4 RESEND] ocfs2: remove extra mlog_errno() call in __ocfs2_add_entry()
Signed-off-by: Daeseok Youn <daeseok.youn at 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;
- }
}
}
--
1.7.1
Joseph Qi
2015-Mar-19 10:45 UTC
[Ocfs2-devel] [PATCH 2/4 RESEND] ocfs2: remove extra mlog_errno() call in __ocfs2_add_entry()
On 2015/2/28 7:49, Daeseok Youn wrote:> Signed-off-by: Daeseok Youn <daeseok.youn at 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.