| Message ID | 1634714621-58190-1-git-send-email-wangqing@vivo.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | btrfs: simplify redundant logic judgment | expand |
On Wed, Oct 20, 2021 at 12:23:41AM -0700, Qing Wang wrote: > From: Wang Qing <wangqing@vivo.com> > > A || (!A && B) is equal to A || B > > Signed-off-by: Wang Qing <wangqing@vivo.com> > --- > 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.
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) ||