1 files changed, 7 insertions, 6 deletions

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 {