2021-10-20 07:26:24

by 王擎

Subject: [PATCH] btrfs: simplify redundant logic judgment

From: Wang Qing <[email protected]>

A || (!A && B) is equal to A || B

Signed-off-by: Wang Qing <[email protected]>
---
fs/btrfs/inode.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 07ba22dd..e0d2660
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -2011,8 +2011,7 @@ int btrfs_run_delalloc_range(struct btrfs_inode *inode, struct page *locked_page
* to use run_delalloc_nocow() here, like for regular
* preallocated inodes.
*/
- ASSERT(!zoned ||
- (zoned && btrfs_is_data_reloc_root(inode->root)));
+ ASSERT(!zoned || btrfs_is_data_reloc_root(inode->root));
ret = run_delalloc_nocow(inode, locked_page, start, end,
page_started, nr_written);
} else if (!inode_can_compress(inode) ||
--
2.7.4

2021-10-21 15:30:03

by David Sterba

Subject: Re: [PATCH] btrfs: simplify redundant logic judgment

On Wed, Oct 20, 2021 at 12:23:41AM -0700, Qing Wang wrote:
> From: Wang Qing <[email protected]>
>
> A || (!A && B) is equal to A || B
>
> Signed-off-by: Wang Qing <[email protected]>
> ---
> fs/btrfs/inode.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
> index 07ba22dd..e0d2660
> --- a/fs/btrfs/inode.c
> +++ b/fs/btrfs/inode.c
> @@ -2011,8 +2011,7 @@ int btrfs_run_delalloc_range(struct btrfs_inode *inode, struct page *locked_page
> * to use run_delalloc_nocow() here, like for regular
> * preallocated inodes.
> */
> - ASSERT(!zoned ||
> - (zoned && btrfs_is_data_reloc_root(inode->root)));
> + ASSERT(!zoned || btrfs_is_data_reloc_root(inode->root));

Thanks, but somebody already sent such patch and we'd like to keep it as
it is for clarity.