Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Qing Wang <wangqing@vivo.com>
To:     Chris Mason <clm@fb.com>, Josef Bacik <josef@toxicpanda.com>,
        David Sterba <dsterba@suse.com>, linux-btrfs@vger.kernel.org,
        linux-kernel@vger.kernel.org
Cc:     Wang Qing <wangqing@vivo.com>
Subject: [PATCH] btrfs: simplify redundant logic judgment
Date:   Wed, 20 Oct 2021 00:23:41 -0700
Message-Id: <1634714621-58190-1-git-send-email-wangqing@vivo.com>
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?h4JaGBNT2gdb9xghWCNf5ZZdhqB5oeUzx3gmae5rL0y4t6lSltbkS7eypLFD?=
 =?us-ascii?Q?D4igt4iWe48CCXv4pSbZNNT9c60NBrJoTHtdWOdAuNxIPocCVlti+lqmUPei?=
 =?us-ascii?Q?B2EOCZ27TLEAYB0SUWyEp3bL+t6kitvHQb55PkLZeQXBidrUdX57+oju0uAF?=
 =?us-ascii?Q?kwnrkcLCdh8v5XsQDwYgh+4rQt/GCOT2lK6WQ9nyaaK9BVzzGDPmtniJGO1+?=
 =?us-ascii?Q?lmKyzEMtj9YBYDmMLGsy1NrPBVl9cASQ7b/YEN/3Asdmaz+k+jy3Q88NJ6fK?=
 =?us-ascii?Q?W7xzOQm4ALWhMtnlILdxXKp3QGxqCbZmKY9iDZULq639KSCzsxUyWYCkFflz?=
 =?us-ascii?Q?nuXWk5gjiomFE5rpXFCyVbNtAwHcvjZpLdjvVfipPGEMgk1bN4YijVMYtF9A?=
 =?us-ascii?Q?isrQW6IriFZQlU/TEFV7d+TgIOOu9ZMWpPED8ovglwwWUkMj0CvJFUbr8kZG?=
 =?us-ascii?Q?YUO+YyC1EYcK4Bk4TAQ7MRTEiEi/aIy1vb+Q3HrKIBWWEPnLthQFtkDet4Ec?=
 =?us-ascii?Q?1MYu0u7a5kSerCg6iTeMGsgxnR5mKqrOmWQ/KpFxfhnwON6TBERizhWdmTls?=
 =?us-ascii?Q?PFIgxHHG27aqymDsI7RF8wFIoOojnG+K43qZvBCmMCHqQtcKFJEW9N5nkfqx?=
 =?us-ascii?Q?5EwL5LJi/ngRDN6vyMOR9sGg49fJHjS9SBLtQLfg9jjwxE6RO0pB3pDI4U0l?=
 =?us-ascii?Q?oeOhsB2Hvg9jLnf1FOrBjhZscVeMo7pCv9dYeQn9h9LfZ8K1liINCbq6BaHv?=
 =?us-ascii?Q?OwO2eMVuaP1e913j/fCGZhqs9cTqWvPeqpubfZMQ8Nyy5OxN4NytiI5EQ1iw?=
 =?us-ascii?Q?AM+dAXhUh/tCIyPcC+VkGr/5YUYIoQfPG1+QpevIPND8lSvudBDwpGcLKTHG?=
 =?us-ascii?Q?ALlYi5t0pDjMznLyB99Qg3lJYIHVuhe0kLgp9qqmN+RMSu0J64GMSj/BXaBN?=
 =?us-ascii?Q?/2w0wDA+G2I7iHpDtRTg9ELUXDIsZb78yAhNqMFG39M5ZWgag/Ia7emtofdR?=
 =?us-ascii?Q?L0SQtoPwXRy/TCPMc0O64ZQN5FQKB0Jffj86Mo8v+tAWMFu9L6BSd7BGq//A?=
 =?us-ascii?Q?BCXEusz8xmHSKCpKSs1/VK28Huk46HrEned0CeVv21Nwz7EO+9PADPxs1gzo?=
 =?us-ascii?Q?AHAUSgdLsYLqc6JE+mNVWdpYj0biFq7cxnTtrd+5t36jVh/v5xi1BaZ+svsb?=
 =?us-ascii?Q?tXViffS3MJCbkdPMBch95s9P8qAAqoV37k0fQvzCD2bcXmJBNWI3aT/SmN1T?=
 =?us-ascii?Q?L6aBKjG7joys1xUdTzPG4qfG2EgPGPZIfWiIOSIqGosHHYXtaueqOc88cIiC?=
 =?us-ascii?Q?ZUnJf/WBP8j+WAxRcbbCRGI1giQ3/fNvsw1/0CovFx6U7joLfLbr7zAcU+TM?=
 =?us-ascii?Q?cwJ46sCVZshi0pTsbo0LwVjswWbbPbdvtNRgXkVRNqZMMQqXN4qVfQLSbtGO?=
 =?us-ascii?Q?x4qqPckHqrQuA1nUt96XjfI1hbzs7Dep6v14gy8Fkfb5HzrBVQSW/BI1/xog?=
 =?us-ascii?Q?dnxouZZZg1rTmW1CSzdQIXAjyGrQPrYcTYgBYOWlOtFPetXJsI+sv4AQBF3J?=
 =?us-ascii?Q?EyhhCQ0Whs7FY02SG3/4xwxXhufC3arxt7Y7ss0eBHcWEIGBVnWdwc6ewApg?=
 =?us-ascii?Q?NnBHnqJKWEShpla4ceKyB0E=3D?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: e89bea51-a947-40d5-2136-08d9939a9108
X-MS-Exchange-CrossTenant-AuthSource: SL2PR06MB3082.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2021 07:23:51.8810
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: g0TpprEO6n0E78Hz+sO1yXGD5l+l/+4WPYA/YsAwuYKhKEyWPX6nogaCPphgNZSlgU3aYK6ye8+Owy7iQFQsow==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SL2PR06MB3114
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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));
 		ret = run_delalloc_nocow(inode, locked_page, start, end,
 					 page_started, nr_written);
 	} else if (!inode_can_compress(inode) ||
-- 
2.7.4