From patchwork Sat Mar 4 02:54:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ye Bin X-Patchwork-Id: 64150 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp742689wrd; Fri, 3 Mar 2023 18:57:51 -0800 (PST) X-Google-Smtp-Source: AK7set87H84/EkgmihGpNrqjt9NX0l5LdqXfzyw4eReERwwtcUUZx+EW2p8DL+WJDdUoD1FRHip4 X-Received: by 2002:a05:6a20:244d:b0:cc:e39e:3f64 with SMTP id t13-20020a056a20244d00b000cce39e3f64mr4370934pzc.24.1677898671159; Fri, 03 Mar 2023 18:57:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677898671; cv=none; d=google.com; s=arc-20160816; b=JrFTQRTCLCVxPf0a254vqjJugnrxsuPIz10F6Uus48SJ2hLg3Axdu6Jx8NSlW1cOoJ VOA+nr8Z3EEa8RbWNTp79qMWL+fxtN87gJcuLfVEz3HzyusbNIh7YdXmZIqNS+rTLV6a EqECXZTg2hrsTZ70v2zPBRENdTDbBEJxVQqtshkX3vhOjq78KRYsxDejIR7e4KWLWbM2 zzOym8XdW2MXTqcCLYd3SFqP2ljF8XHc5ZGaoAlTvMMrHO8+LCWyjRcg8qV776bbaAyo Fpn3Eu3Y3QCrQuSHNFiYEdz090cHFY2C8XuSuj2vCfQsfqwOx0ep3diD63dLEPOfAEYY THVw== 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=bsvPTi7BvuHPa9b+ex9Q4N7exKI9PtbJfOmhFvs10PM=; b=MBqwPL+CkJCw3qdQ5FRZqNR8qkJkaqKXHvIYCHei2BVC/8Q5BNFBAFQUmBDwHxNh6A ct8CgYnYpfnTekflIFq23KlbnJZ98IfcRJSXI9OL/TVEFsb7L2JzUmo6GG9LA0L5jUTJ GDeEiWRVAXXIoe+KWvlGLmIJtZ86ACzgEWp773remLbnZ5gqt4QzfeU27ioLifw82eQY wKJSs58xayUukyZr/FRQWjQAY46Ss2O0wpYAXqSCvbDpGdf83xp64L5jOZHlNxIfWcsr Xc6R0fldQUK0M1x1qac0F6HMIqujvi3ZzLUXvUhiNJdltsuiaaBHLyzhP+plBtHxwdGx QllQ== 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 v7-20020a63f847000000b004fc21b8bd98si3663141pgj.328.2023.03.03.18.57.34; Fri, 03 Mar 2023 18:57:51 -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 S229726AbjCDCby (ORCPT + 99 others); Fri, 3 Mar 2023 21:31:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44032 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229447AbjCDCbu (ORCPT ); Fri, 3 Mar 2023 21:31:50 -0500 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3D78BEC52; Fri, 3 Mar 2023 18:31:49 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.169]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4PT83z4qb3z4f3jLh; Sat, 4 Mar 2023 10:31:43 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.127.227]) by APP3 (Coremail) with SMTP id _Ch0CgCnUiCPrQJk3eg0EQ--.50517S5; Sat, 04 Mar 2023 10:31:45 +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 v3 1/2] ext4: remove set 'EXT4_STATE_MAY_INLINE_DATA' flag from ext4_find_inline_data_nolock() Date: Sat, 4 Mar 2023 10:54:57 +0800 Message-Id: <20230304025458.4007825-2-yebin@huaweicloud.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20230304025458.4007825-1-yebin@huaweicloud.com> References: <20230304025458.4007825-1-yebin@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: _Ch0CgCnUiCPrQJk3eg0EQ--.50517S5 X-Coremail-Antispam: 1UD129KBjvJXoW7tFyUWF4fAF43Aw47WFykXwb_yoW8Ww43pr s8GrykGw4kZFyDuFZ2gr1UZr1a9a1xCr4UWFWS9r4kXF98J34xKr1Yyr13AFyUGrZFy3ya gFy5trW8uw43CrJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUvlb4IE77IF4wAFF20E14v26r4j6ryUM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI8067AKxVWUGw A2048vs2IY020Ec7CjxVAFwI0_JFI_Gr1l8cAvFVAK0II2c7xJM28CjxkF64kEwVA0rcxS w2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJwA2z4x0Y4vE2Ix0cI8IcVCY1x0267AKxV WxJVW8Jr1l84ACjcxK6I8E87Iv67AKxVW0oVCq3wA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_ GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx 0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v26r1j6r4UMcvjeVCFs4IE7xkEbVWU JVW8JwACjcxG0xvY0x0EwIxGrwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJV W8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF 1VAFwI0_JF0_Jw1lIxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUJVWUCwCI42IY6x IIjxv20xvEc7CjxVAFwI0_Gr0_Cr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvE x4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVjvj DU0xZFpf9x07U_pnPUUUUU= X-CM-SenderInfo: p1hex046kxt4xhlfz01xgou0bp/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_NONE autolearn=ham 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?1759404277074250067?= X-GMAIL-MSGID: =?utf-8?q?1759404277074250067?= From: Ye Bin As only ext4_iget_extra_inode() call ext4_find_inline_data_nolock() need to set 'EXT4_STATE_MAY_INLINE_DATA' flag. The call in ext4_write_inline_data_end() is there only need to update i_inline_off. So move set 'EXT4_STATE_MAY_INLINE_DATA' flag from ext4_find_inline_data_nolock() 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;