Skip to contentSkip to conversation

ocfs2: need to handle error for ocfs2_journal_access_di() call

PATCH In review Daeseok Youn 1 participant 1 message Feb 23, 2015 OCFS2

lore
Share & tools
lore
#0 lore raw

PATCH 3/3 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.

---
 fs/ocfs2/dir.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
fs/ocfs2/dir.c +4 -4
index c1ab24f..c63f2b6 100644
@@ -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)) {
Signature · 1 line
1.7.1