Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 497f6926 authored by Jan Kara's avatar Jan Kara Committed by Dan Williams
Browse files

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: default avatarRoss Zwisler <ross.zwisler@linux.intel.com>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent 71eab6df

fs/ext4/file.c

+7 −6
Original line number Diff line number Diff line
@@ -302,15 +302,16 @@ 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;

	if (write) {

		if (!IS_ERR(handle))

		ext4_journal_stop(handle);

		up_read(&EXT4_I(inode)->i_mmap_sem);

		sb_end_pagefault(sb);