* [PATCH v2] btrfs: remove unused condition check in btrfs_page_mkwrite()
@ 2019-12-03 8:59 Yunfeng Ye
2019-12-03 18:29 ` David Sterba
0 siblings, 1 reply; 2+ messages in thread
From: Yunfeng Ye @ 2019-12-03 8:59 UTC (permalink / raw)
To: clm, josef, dsterba, linux-btrfs, linux-kernel, hushiyuan, linfeilong
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 <yeyunfeng@huawei.com>
Reviewed-by: Omar Sandoval <osandov@fb.com>
---
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2] btrfs: remove unused condition check in btrfs_page_mkwrite()
2019-12-03 8:59 [PATCH v2] btrfs: remove unused condition check in btrfs_page_mkwrite() Yunfeng Ye
@ 2019-12-03 18:29 ` David Sterba
0 siblings, 0 replies; 2+ messages in thread
From: David Sterba @ 2019-12-03 18:29 UTC (permalink / raw)
To: Yunfeng Ye
Cc: clm, josef, dsterba, linux-btrfs, linux-kernel, hushiyuan, linfeilong
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 <yeyunfeng@huawei.com>
> Reviewed-by: Omar Sandoval <osandov@fb.com>
Added to misc-next, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-12-03 18:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-12-03 8:59 [PATCH v2] btrfs: remove unused condition check in btrfs_page_mkwrite() Yunfeng Ye
2019-12-03 18:29 ` David Sterba
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).