diff options
| author | Jan Kara <jack@suse.cz> | 2017-11-01 16:36:44 +0100 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2017-11-03 06:26:26 -0700 |
| commit | 497f6926d880c57f65bf7c3f1086526fa774c55e (patch) | |
| tree | 706430ecedbb3c011c9d5ed2f8ebef962e1332ae /fs/ext4 | |
| parent | 71eab6dfd91eabf06fe782a590c07e8a0795f5ea (diff) | |
| download | linux-497f6926d880c57f65bf7c3f1086526fa774c55e.tar.gz linux-497f6926d880c57f65bf7c3f1086526fa774c55e.tar.bz2 linux-497f6926d880c57f65bf7c3f1086526fa774c55e.zip | |
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>
Diffstat (limited to 'fs/ext4')
| -rw-r--r-- | fs/ext4/file.c | 13 |
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 { |