From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753900AbdK1MSe (ORCPT ); Tue, 28 Nov 2017 07:18:34 -0500 Received: from mailout2.samsung.com ([203.254.224.25]:17789 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753685AbdK1MSb (ORCPT ); Tue, 28 Nov 2017 07:18:31 -0500 DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.samsung.com 20171128121830epoutp0276c3a3490a24c42e183bc154d133d048~7PyDSW0Dj2611126111epoutp02y X-AuditID: b6c32a4b-cf7ff700000011c1-fd-5a1d54159652 From: "LiFan" To: "'Chao Yu'" , "'Chao Yu'" , "'Jaegeuk Kim'" Cc: , Subject: [f2fs-dev] [PATCH] f2fs: remove a redundant conditional expression Date: Tue, 28 Nov 2017 20:17:41 +0800 Message-ID: <000b01d36842$fed887d0$fc899770$@samsung.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Mailer: Microsoft Outlook 14.0 Thread-Index: AdNoQuL1wdjs4GOZQvuQ5lwcgSabig== Content-Language: zh-cn X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprFKsWRmVeSWpSXmKPExsWy7bCmhq5oiGyUwaM+bYvTU88yWTxZP4vZ 4tIid4vLu+awWUx9vJbVgdWj5chbVo9NqzrZPHYv+Mzk8XmTXABLFJdNSmpOZllqkb5dAlfG 2l+H2QuOsFVM/RvawLiQtYuRk0NCwETi7+J77F2MXBxCArsZJU4sWc8C4XxilOh9sI0JwvnG KNH25iwLTEvblf2MEIm9jBLX526AqnrKKHFq/XmgYRwcbAIaElM3y4A0iAhkS8w8f5wZxGYW 8JH4fesemC0s4C3RM/UdO4jNIqAq8WvDXGaQVl4BS4kDkwNAwrwCghInZz5hgWiVl9j+dg4z xA0KEjvOvmYEKRcR0JNYsSIIokRc4k5rKyvINRICe9gk7nzZywRR7yLx7OZedghbWOLV8S1Q tpTEy/42KHsdo8TnMxYQzdsZJeZ9/AjVbC2xec0vsLeYBTQl1u/ShwjbSvzovsoEsZhPovf3 EyaQEgkBXomONiGIEjWJl6tnQYNNRmLe/T6oiR4SvTua2ScwKs1C8uUsJF/OQvLOLITFCxhZ VjFKphYU56anFpsWGOellusVJ+YWl+al6yXn525iBKcYLe8djJvO+RxiFOBgVOLhfeEmEyXE mlhWXJl7iFGCg1lJhFfcQjZKiDclsbIqtSg/vqg0J7X4EKM0B4uSOO+xnaWRQgLpiSWp2amp BalFMFkmDk6pBkam34IyRmsssl/dOzZjx5w5Ic9yX0aLKvZ0XXvdn6w70TW86vuarUcSLaTK 9ghwnl/Fte79RNZZu02qf5csc5jdELnI336hiO0i/2b1Sb8Kwz5mbtgjtv+7yMkZ/FvCnu7K Xhy3jHnei2s7Dp9pX3CgpKXFYJaNk75B4TahTxKGUmd5/Jb+YNJXYinOSDTUYi4qTgQAj0uP di0DAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrCLMWRmVeSWpSXmKPExsWy7bCSnK5oiGyUwZUuHovTU88yWTxZP4vZ 4tIid4vLu+awWUx9vJbVgdWj5chbVo9NqzrZPHYv+Mzk8XmTXABLFJdNSmpOZllqkb5dAlfG 2l+H2QuOsFVM/RvawLiQtYuRk0NCwESi7cp+xi5GLg4hgd2MEit+LmKGSMhILDj8hR3CFpZY +e85O0TRY0aJ6Tt2AnVzcLAJaEhM3SwDUiMikCsxdcp3JhCbWcBPYtfDFWBzhAW8JXqmvgOb wyKgKvFrw1xmkFZeAUuJA5MDQMK8AoISJ2c+YYFo1ZbofdjKCGHLS2x/OwfqHAWJHWdfM4K0 igjoSaxYEQRRIi5xp7WVdQKj4Cwkk2YhmTQLyaRZSFoWMLKsYpRMLSjOTc8tNiwwzEst1ytO zC0uzUvXS87P3cQIDnstzR2Ml5fEH2IU4GBU4uGd4CITJcSaWFZcmXuIUYKDWUmEV9xCNkqI NyWxsiq1KD++qDQntfgQozQHi5I479O8Y5FCAumJJanZqakFqUUwWSYOTqkGRhvWIvbGq08m rl72Mbrjx86ynrOrfk39sW7VcxuDhpMnnp0LnXB7ylqz/00ZorYSeQxVgZ2qEc8yFnY82/Pu TNC6P8tmZLIYH3zivOmx0FlVF92v0jvypG7fKAjcx2u2tf3Cqg3ra7kSK5MPnhIv3pwxN+eD YOvs/unpVp9+q+h/mPj7q9Le4tdKLMUZiYZazEXFiQBvD5t6dwIAAA== X-CMS-MailID: 20171128121829epcas5p1d7a840229243b79f5b82d56d0b4dc38d X-Msg-Generator: CA Content-Type: text/plain; charset="utf-8" X-MTR: 20171128121829epcas5p1d7a840229243b79f5b82d56d0b4dc38d CMS-TYPE: 105P X-CMS-RootMailID: 20171128121829epcas5p1d7a840229243b79f5b82d56d0b4dc38d X-RootMTR: 20171128121829epcas5p1d7a840229243b79f5b82d56d0b4dc38d References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Avoid checking is_inode repeatedly, and make the logic a little bit clearer. Signed-off-by: Fan li --- fs/f2fs/f2fs.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index 4acdca4..95cc4ef 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -1995,11 +1995,11 @@ static inline block_t datablock_addr(struct inode *inode, raw_node = F2FS_NODE(node_page); /* from GC path only */ - if (!inode) { - if (is_inode) + if (is_inode) { + if (!inode) base = offset_in_addr(&raw_node->i); - } else if (f2fs_has_extra_attr(inode) && is_inode) { - base = get_extra_isize(inode); + else if (f2fs_has_extra_attr(inode)) + base = get_extra_isize(inode); } addr_array = blkaddr_in_node(raw_node); -- 2.7.4