The patch titled
Subject: ocfs2: need to handle error for ocfs2_journal_access_di() call
has been removed from the -mm tree. Its filename was
ocfs2-need-to-handle-error-for-ocfs2_journal_access_di-call.patch
This patch was dropped because other changes were merged, which wrecked this patch
------------------------------------------------------
From: Daeseok Youn <daeseok.youn@xxxxxxxxx>
Subject: ocfs2: need to handle error for ocfs2_journal_access_di() call
There is no error handle when ocfs2_journal_access_di() is failed. And
also it doesn't need to call ocfs2_dx_dir_insert() when
ocfs2_journal_access_db() is failed.
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, 4 insertions(+), 4 deletions(-)
diff -puN fs/ocfs2/dir.c~ocfs2-need-to-handle-error-for-ocfs2_journal_access_di-call fs/ocfs2/dir.c
--- a/fs/ocfs2/dir.c~ocfs2-need-to-handle-error-for-ocfs2_journal_access_di-call
+++ a/fs/ocfs2/dir.c
@@ -1703,15 +1703,15 @@ int __ocfs2_add_entry(handle_t *handle,
insert_bh,
OCFS2_JOURNAL_ACCESS_WRITE);
- if (ocfs2_dir_indexed(dir)) {
+ if (!retval && ocfs2_dir_indexed(dir))
retval = ocfs2_dx_dir_insert(dir,
handle,
lookup);
- if (retval)
- goto bail;
- }
}
+ if (retval)
+ goto bail;
+
/* By now the buffer is marked for journaling */
offset += le16_to_cpu(de->rec_len);
if (le64_to_cpu(de->inode)) {
_
Patches currently in -mm which might be from daeseok.youn@xxxxxxxxx are
ocfs2-avoid-a-pointless-delay-in-o2cb_cluster_check.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
