Commit 76de60ed authored Dec 03, 2019 by Yunfeng Ye Committed by David Sterba Jan 20, 2020

btrfs: remove unused condition check in btrfs_page_mkwrite()



The condition '!ret2' is always true. commit 717beb96 ("Btrfs: fix
regression in btrfs_page_mkwrite() from vm_fault_t conversion") left
behind the check after moving this code out of the goto, so remove the
unused condition check.

Reviewed-by: Omar Sandoval <osandov@fb.com>
Signed-off-by: Yunfeng Ye <yeyunfeng@huawei.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

parent 36ee0b44

fs/btrfs/inode.c

+4 −7

Original line number	Diff line number	Diff line
		@@ -9099,7 +9099,6 @@ again:
		ret = VM_FAULT_SIGBUS;
		goto out_unlock;
		}
		ret2 = 0;

		/* page is wholly or partially inside EOF */
		if (page_start + PAGE_SIZE > size)
		@@ -9123,12 +9122,10 @@ again:

		unlock_extent_cached(io_tree, page_start, page_end, &cached_state);

		if (!ret2) {
		btrfs_delalloc_release_extents(BTRFS_I(inode), PAGE_SIZE);
		sb_end_pagefault(inode->i_sb);
		extent_changeset_free(data_reserved);
		return VM_FAULT_LOCKED;
		}

		out_unlock:
		unlock_page(page);

Admin message