From patchwork Tue Mar 7 01:52:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ye Bin X-Patchwork-Id: 65192 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2182220wrd; Mon, 6 Mar 2023 17:44:15 -0800 (PST) X-Google-Smtp-Source: AK7set8t+zFvAsf2hTf9pRqXaFN+wb0owN1ncHBr6m0sxqtcRGbwrwhpQr7apfitS2VVpLvHx9D9 X-Received: by 2002:a05:6a20:440b:b0:cc:773d:4fa1 with SMTP id ce11-20020a056a20440b00b000cc773d4fa1mr17004838pzb.27.1678153455120; Mon, 06 Mar 2023 17:44:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678153455; cv=none; d=google.com; s=arc-20160816; b=A+1IQlefljnf3XgeVopoE98HY4PWN/LYo0UjFkDWOm8jVbrWBKlzKxjmS1xFIOtR+q H1oPBR10nitinzbuCM+qgmxwQrHJlwYHhKv6GobWL9n+Fl2Xw/Ltxg1nBSLhzLmfTZBq KICZxoooaxNE704dgNmns82v7L89JXjNeTZFUc/rI68VUKKoYloDcU/WeSBxL782wDQ0 BbD40s6nKK2ddLKQ5Pq0oP5D3mOWavhx891OS1fvjochBAHzheMGeActQMe3T+FuNtRa T9gYNlS5qddDs4/6wuOJ2i5kZKiy3LGArItnNWMyLEZ/tQuJZ/VyqXw0pfKAHqMs8TlY Q5dg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=+ImzpcQCeGnl8/aJwdt9A29eqLxVqYXra3PUlrw/OTQ=; b=zD7VV3TNMtRomufGarvtO8Zr2W8wWs2hZC2/ESeiWJlUA89A48r6GbBJftx++zqzps pZ5QolQ88AFVj0d+REa3mOTJuk6zqdYRCdDFFDQohoy8XQIXxWQiA+B1XLvaDRU+uGpr d4v5IA4fv48R7JspNacpPWIoB/NMrISADLMLjYhxq81qG8JdXyaXXd9kxQEDDpu+u3ks R6tWUcueTf2N8o15/gbH4tQXWiXZK1GU+OuKtGWqAs2cvdnL/N4fHrBwHn2WxeGR/fEe PCFCw5EzvvnMkF0VMXP32NasvaQfcSUut6LewBudG+lFejFs81B8grSfV/Xhbavk86La iZzw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k22-20020a635a56000000b004fc2f2d9cb9si10277757pgm.126.2023.03.06.17.44.02; Mon, 06 Mar 2023 17:44:15 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229726AbjCGB37 (ORCPT + 99 others); Mon, 6 Mar 2023 20:29:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56464 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229880AbjCGB3t (ORCPT ); Mon, 6 Mar 2023 20:29:49 -0500 Received: from dggsgout11.his.huawei.com (unknown [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F32FB37F35; Mon, 6 Mar 2023 17:29:47 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.169]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4PVyY22SyBz4f3m6j; Tue, 7 Mar 2023 09:29:42 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.127.227]) by APP3 (Coremail) with SMTP id _Ch0CgBH9CGFkwZk1RTkEQ--.45801S5; Tue, 07 Mar 2023 09:29:44 +0800 (CST) From: Ye Bin To: tytso@mit.edu, adilger.kernel@dilger.ca, linux-ext4@vger.kernel.org Cc: linux-kernel@vger.kernel.org, jack@suse.cz, Ye Bin Subject: [PATCH v4 1/2] ext4: remove set 'EXT4_STATE_MAY_INLINE_DATA' flag from ext4_find_inline_data_nolock() Date: Tue, 7 Mar 2023 09:52:52 +0800 Message-Id: <20230307015253.2232062-2-yebin@huaweicloud.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20230307015253.2232062-1-yebin@huaweicloud.com> References: <20230307015253.2232062-1-yebin@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: _Ch0CgBH9CGFkwZk1RTkEQ--.45801S5 X-Coremail-Antispam: 1UD129KBjvJXoW7try7Aw4kCFyrCF13uF18uFg_yoW8Aw1kpr Z8G34kGw1DZFyv9FZ2qr1UZr1aga1xCw4UWFyI9r4kXF95J34Igr1Yyr13Aa4UKrWqv3ya gFy5Kr48uw13GrJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUvGb4IE77IF4wAFF20E14v26r4j6ryUM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI8067AKxVWUGw A2048vs2IY020Ec7CjxVAFwI0_JFI_Gr1l8cAvFVAK0II2c7xJM28CjxkF64kEwVA0rcxS w2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3wA2z4x0Y4vE2Ix0cI8IcVCY1x0267AKxV W8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I8E87Iv6xkF7I0E14v2 6rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F40Ex7xfMc Ij6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_ Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr 0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY 17CE14v26r126r1DMIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_Jr0_JF4lIxAIcV C0I7IYx2IY6xkF7I0E14v26r4j6F4UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY 6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6xkF7I0E14v26r4j6r4UJbIYCTnIWIevJa 73UjIFyTuYvjxUzoGQUUUUU X-CM-SenderInfo: p1hex046kxt4xhlfz01xgou0bp/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=-0.5 required=5.0 tests=BAYES_00,KHOP_HELO_FCRDNS, MAY_BE_FORGED,SPF_HELO_NONE,SPF_NONE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759671437162685103?= X-GMAIL-MSGID: =?utf-8?q?1759671437162685103?= From: Ye Bin The only caller of ext4_find_inline_data_nolock() that needs setting of EXT4_STATE_MAY_INLINE_DATA flag is ext4_iget_extra_inode(). In ext4_write_inline_data_end() we just need to update inode->i_inline_off. Since we are going to add one more caller that does not need to set EXT4_STATE_MAY_INLINE_DATA, just move setting of EXT4_STATE_MAY_INLINE_DATA out to ext4_iget_extra_inode(). Signed-off-by: Ye Bin Reviewed-by: Jan Kara --- fs/ext4/inline.c | 1 - fs/ext4/inode.c | 7 ++++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c index 2b42ececa46d..1602d74b5eeb 100644 --- a/fs/ext4/inline.c +++ b/fs/ext4/inline.c @@ -159,7 +159,6 @@ int ext4_find_inline_data_nolock(struct inode *inode) (void *)ext4_raw_inode(&is.iloc)); EXT4_I(inode)->i_inline_size = EXT4_MIN_INLINE_DATA_SIZE + le32_to_cpu(is.s.here->e_value_size); - ext4_set_inode_state(inode, EXT4_STATE_MAY_INLINE_DATA); } out: brelse(is.iloc.bh); diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index d251d705c276..bf0b7dea4900 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -4797,8 +4797,13 @@ static inline int ext4_iget_extra_inode(struct inode *inode, if (EXT4_INODE_HAS_XATTR_SPACE(inode) && *magic == cpu_to_le32(EXT4_XATTR_MAGIC)) { + int err; + ext4_set_inode_state(inode, EXT4_STATE_XATTR); - return ext4_find_inline_data_nolock(inode); + err = ext4_find_inline_data_nolock(inode); + if (!err && ext4_has_inline_data(inode)) + ext4_set_inode_state(inode, EXT4_STATE_MAY_INLINE_DATA); + return err; } else EXT4_I(inode)->i_inline_off = 0; return 0;