ext4: Simplify error handling in ext4_dax_huge_fault()

If transaction starting fails, just bail out of the function immediately
instead of checking for that condition throughout the function.

Reviewed-by: Ross Zwisler <ross.zwisler@linux.intel.com>
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>

diff --git a/fs/ext4/file.c b/fs/ext4/file.c
index 3cec0b95672fd555053163f8c1614194cb42e6bd..208adfc3e673324886ed6f08e04a33680a20c2aa 100644 (file)
--- 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 {