2019-12-03 09:00:52

by Yunfeng Ye

Subject: [PATCH v2] btrfs: remove unused condition check in btrfs_page_mkwrite()

The condition '!ret2' is always true. commit 717beb96d969 ("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.

Signed-off-by: Yunfeng Ye <[email protected]>
Reviewed-by: Omar Sandoval <[email protected]>
---
v1 -> v2:
- update the commit comment

fs/btrfs/inode.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 56032c518b26..eef2432597e2 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -9073,7 +9073,6 @@ vm_fault_t btrfs_page_mkwrite(struct vm_fault *vmf)
ret = VM_FAULT_SIGBUS;
goto out_unlock;
}
- ret2 = 0;

/* page is wholly or partially inside EOF */
if (page_start + PAGE_SIZE > size)
@@ -9097,12 +9096,10 @@ vm_fault_t btrfs_page_mkwrite(struct vm_fault *vmf)

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;
- }
+ 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);
--
2.7.4

2019-12-03 18:31:44

by David Sterba

Subject: Re: [PATCH v2] btrfs: remove unused condition check in btrfs_page_mkwrite()

On Tue, Dec 03, 2019 at 04:59:25PM +0800, Yunfeng Ye wrote:
> The condition '!ret2' is always true. commit 717beb96d969 ("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.
>
> Signed-off-by: Yunfeng Ye <[email protected]>
> Reviewed-by: Omar Sandoval <[email protected]>

Added to misc-next, thanks.