The patch titled
Subject: ocfs2: remove extra mlog_errno() call in __ocfs2_add_entry()
has been added to the -mm tree. Its filename is
ocfs2-remove-extra-mlog_errno-call-in-__ocfs2_add_entry.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/ocfs2-remove-extra-mlog_errno-call-in-__ocfs2_add_entry.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/ocfs2-remove-extra-mlog_errno-call-in-__ocfs2_add_entry.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Daeseok Youn <daeseok.youn@xxxxxxxxx>
Subject: ocfs2: remove extra mlog_errno() call in __ocfs2_add_entry()
Signed-off-by: Daeseok Youn <daeseok.youn@xxxxxxxxx>
Cc: Joel Becker <jlbec@xxxxxxxxxxxx>
Cc: Mark Fasheh <mfasheh@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/ocfs2/dir.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff -puN fs/ocfs2/dir.c~ocfs2-remove-extra-mlog_errno-call-in-__ocfs2_add_entry fs/ocfs2/dir.c
--- a/fs/ocfs2/dir.c~ocfs2-remove-extra-mlog_errno-call-in-__ocfs2_add_entry
+++ a/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;
- }
}
}
_
Patches currently in -mm which might be from daeseok.youn@xxxxxxxxx are
ocfs2-remove-unneeded-rc-for-kfree.patch
ocfs2-avoid-a-pointless-delay-in-o2cb_cluster_check.patch
ocfs2-remove-unneeded-variable-status.patch
ocfs2-remove-extra-mlog_errno-call-in-__ocfs2_add_entry.patch
ocfs2-need-to-handle-error-for-ocfs2_journal_access_di-call.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
