diff mbox series

[15/19] ext4: Simplify error handling in ext4_dax_huge_fault()

Message ID 20171011200603.27442-16-jack@suse.cz
State Not Applicable, archived
Headers show
Series dax, ext4, xfs: Synchronous page faults | expand

Commit Message

Jan Kara Oct. 11, 2017, 8:05 p.m. UTC 
If transaction starting fails, just bail out of the function immediately
instead of checking for that condition throughout the function.

Signed-off-by: Jan Kara <jack@suse.cz>
---
 fs/ext4/file.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

Comments

Ross Zwisler Oct. 13, 2017, 8:09 p.m. UTC | #1 
On Wed, Oct 11, 2017 at 10:05:59PM +0200, Jan Kara wrote:
> If transaction starting fails, just bail out of the function immediately
> instead of checking for that condition throughout the function.
> 
> Signed-off-by: Jan Kara <jack@suse.cz>

Yep, looks correct and is cleaner:

Reviewed-by: Ross Zwisler <ross.zwisler@linux.intel.com>
diff mbox series

Patch

diff --git a/fs/ext4/file.c b/fs/ext4/file.c
index 3cec0b95672f..208adfc3e673 100644
--- a/fs/ext4/file.c
+++ b/fs/ext4/file.c
@@ -302,16 +302,17 @@  static int ext4_dax_huge_fault(struct vm_fault *vmf,
 		down_read(&EXT4_I(inode)->i_mmap_sem);
 		handle = ext4_journal_start_sb(sb, EXT4_HT_WRITE_PAGE,
 					       EXT4_DATA_TRANS_BLOCKS(sb));
+		if (IS_ERR(handle)) {
+			up_read(&EXT4_I(inode)->i_mmap_sem);
+			sb_end_pagefault(sb);
+			return VM_FAULT_SIGBUS;
+		}
 	} else {
 		down_read(&EXT4_I(inode)->i_mmap_sem);
 	}
-	if (!IS_ERR(handle))
-		result = dax_iomap_fault(vmf, pe_size, NULL, &ext4_iomap_ops);
-	else
-		result = VM_FAULT_SIGBUS;
+	result = dax_iomap_fault(vmf, pe_size, NULL, &ext4_iomap_ops);
 	if (write) {
-		if (!IS_ERR(handle))
-			ext4_journal_stop(handle);
+		ext4_journal_stop(handle);
 		up_read(&EXT4_I(inode)->i_mmap_sem);
 		sb_end_pagefault(sb);
 	} else {