From nobody Fri Dec 19 21:50:51 2025 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 35B181BDA99; Wed, 22 Jan 2025 11:47:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.56 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737546446; cv=none; b=Unio0RlUfdc100Zjoz0ndGZqQvvXsj8k5RfitRF+orQqPFGP9JmeOC4GV03t/4OmkcNVqi5d33HWP3zs4VNskqpgtUxTHkA8qftdR3gOkFNx6oI2UkwG6n9lV29e3j1PhQt5J8Z6mosB8nuUjKp+7SDvHOXF2+D2//XZIi3vtcM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737546446; c=relaxed/simple; bh=CYbud3hksbn6ARgpdsBFCAasNPLtxmxeG896AP2SiyE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=dYIqquyB/mcBNrsiKGx0xRv/wT1gqR0y8eI/I1dqYLexJkiZNG3hXdwCSE2/RDh+qjY7tuLuRK/rRLPmnv9u/TcL+eVQh1lPqw7H6wHzXyqFrHcHELa+L3svI9MsqQPOg9JBcN8J/HH/Cy490AOCOpHH6pcSZ6T47OnHkFlG6U8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com; spf=pass smtp.mailfrom=huaweicloud.com; arc=none smtp.client-ip=45.249.212.56 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huaweicloud.com Received: from mail.maildlp.com (unknown [172.19.93.142]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4YdMkD0L20z4f3jdD; Wed, 22 Jan 2025 19:47:00 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.128]) by mail.maildlp.com (Postfix) with ESMTP id A56F11A0D97; Wed, 22 Jan 2025 19:47:20 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.104.67]) by APP4 (Coremail) with SMTP id gCh0CgD3Wl_F2pBn0KiuBg--.48765S5; Wed, 22 Jan 2025 19:47:20 +0800 (CST) From: libaokun@huaweicloud.com To: linux-ext4@vger.kernel.org Cc: tytso@mit.edu, adilger.kernel@dilger.ca, jack@suse.cz, linux-kernel@vger.kernel.org, yi.zhang@huawei.com, yangerkun@huawei.com, libaokun@huaweicloud.com, Baokun Li Subject: [PATCH v2 1/7] ext4: convert EXT4_FLAGS_* defines to enum Date: Wed, 22 Jan 2025 19:41:24 +0800 Message-Id: <20250122114130.229709-2-libaokun@huaweicloud.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20250122114130.229709-1-libaokun@huaweicloud.com> References: <20250122114130.229709-1-libaokun@huaweicloud.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: gCh0CgD3Wl_F2pBn0KiuBg--.48765S5 X-Coremail-Antispam: 1UD129KBjvdXoWrurWxAFyUZFW7AFyxJry8AFb_yoWDGFbEka yIvr4rWrs3CF1S9Fn5CryYyr10gr4Iyr4UWFnY9ryrXr4UJrWrJFyDCrWDArn5WF4UuF15 ArWkXry2qFy0qjkaLaAFLSUrUUUUjb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbgxFF20E14v26ryj6rWUM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI8067AKxVWUGwA2048vs2IY02 0Ec7CjxVAFwI0_JFI_Gr1l8cAvFVAK0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xv wVC0I7IYx2IY67AKxVW7JVWDJwA2z4x0Y4vE2Ix0cI8IcVCY1x0267AKxVWxJVW8Jr1l84 ACjcxK6I8E87Iv67AKxVW0oVCq3wA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_GcCE3s1le2I2 62IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcV AFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v26r1j6r4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG 0xvY0x0EwIxGrwACjI8F5VA0II8E6IAqYI8I648v4I1lw4CEc2x0rVAKj4xxMxkF7I0En4 kS14v26r1q6r43MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E 5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUtV W8ZwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY 1x0267AKxVW8JVWxJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI 0_Gr0_Cr1lIxAIcVC2z280aVCY1x0267AKxVW8Jr0_Cr1UYxBIdaVFxhVjvjDU0xZFpf9x 0JUho7_UUUUU= X-CM-SenderInfo: 5olet0hnxqqx5xdzvxpfor3voofrz/1tbiAgAQBWeQpvkM-wACsO Content-Type: text/plain; charset="utf-8" From: Baokun Li Do away with the defines and use an enum as it's cleaner. Signed-off-by: Baokun Li Reviewed-by: Jan Kara Reviewed-by: Zhang Yi --- fs/ext4/ext4.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index 550d21ddba8c..4491e82cfa6f 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -2233,9 +2233,11 @@ extern int ext4_feature_set_ok(struct super_block *s= b, int readonly); /* * Superblock flags */ -#define EXT4_FLAGS_RESIZING 0 -#define EXT4_FLAGS_SHUTDOWN 1 -#define EXT4_FLAGS_BDEV_IS_DAX 2 +enum { + EXT4_FLAGS_RESIZING, /* Avoid superblock update and resize race */ + EXT4_FLAGS_SHUTDOWN, /* Prevent access to the file system */ + EXT4_FLAGS_BDEV_IS_DAX, /* Current block device support DAX */ +}; =20 static inline int ext4_forced_shutdown(struct super_block *sb) { --=20 2.39.2 From nobody Fri Dec 19 21:50:51 2025 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 455DB211A2E; Wed, 22 Jan 2025 11:47:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.56 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737546448; cv=none; b=Qf62aLz7jBUs5w71LrFvDk0NvxuMshUvRzt3kdR9Q7wkTbxjE6bDSpi2bwuRmobx9CwxnC2olF0gzyYE6mfA7efD7NKVh9yN/otYP5FiwumX8l8zh8fKtD2S9fp6+C4jOiN9SPMOYdISuSLzIS0kJnZE0psSmOuJytDGq3+eJGE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737546448; c=relaxed/simple; bh=WIhs9KCIhiLPZFHPhbpwABjIqLx3fucqJt5GWMZQtow=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=nRCgXXdC8+cSXcrAmmgY7RsCtxMa74UfcQuOf2erVmkMPhfnWRQJVY0bNOmDRg4lXx0jFbpG3pE5kto9Dpbwni7C25f5PBXFPzrtuqWPE3+RQbzq+GKmb4bOzBJeff+meeyTUrKTjl9zxvK0+qIhGRgR/i06v4YafRDakTqpb0E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com; spf=pass smtp.mailfrom=huaweicloud.com; arc=none smtp.client-ip=45.249.212.56 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huaweicloud.com Received: from mail.maildlp.com (unknown [172.19.93.142]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4YdMkD37QLz4f3jdH; Wed, 22 Jan 2025 19:47:00 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.128]) by mail.maildlp.com (Postfix) with ESMTP id 1387B1A0D9E; Wed, 22 Jan 2025 19:47:21 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.104.67]) by APP4 (Coremail) with SMTP id gCh0CgD3Wl_F2pBn0KiuBg--.48765S6; Wed, 22 Jan 2025 19:47:20 +0800 (CST) From: libaokun@huaweicloud.com To: linux-ext4@vger.kernel.org Cc: tytso@mit.edu, adilger.kernel@dilger.ca, jack@suse.cz, linux-kernel@vger.kernel.org, yi.zhang@huawei.com, yangerkun@huawei.com, libaokun@huaweicloud.com, Baokun Li Subject: [PATCH v2 2/7] ext4: add EXT4_FLAGS_EMERGENCY_RO bit Date: Wed, 22 Jan 2025 19:41:25 +0800 Message-Id: <20250122114130.229709-3-libaokun@huaweicloud.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20250122114130.229709-1-libaokun@huaweicloud.com> References: <20250122114130.229709-1-libaokun@huaweicloud.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: gCh0CgD3Wl_F2pBn0KiuBg--.48765S6 X-Coremail-Antispam: 1UD129KBjvJXoW7uw4fWr1UGF1DJr17Kr4xXrb_yoW8Xr4Dpa n3Ca48Cr40qF1Uuw47Wa4UX3WIvw18Cw4DWry2ya15WFZ8XryruF1ftFyFqFy0grZ7AFyf XF1rKFy7Cw43GrDanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPv14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2048vs2IY020E87I2jVAFwI0_Jryl82xGYIkIc2 x26xkF7I0E14v26r4j6ryUM28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0 Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Cr0_Gr1UM2 8EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AI xVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20x vE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xv r2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20VAGYxC7M4kE6xkIj40Ew7xC0wCY1x0262 kKe7AKxVWUtVW8ZwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s02 6c02F40E14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_Jw 0_GFylIxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvE c7CjxVAFwI0_Gr0_Cr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14 v26r4j6F4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Gr1j6F4UJbIYCTnIWIevJa73UjIFyTuY vjfU1lkVUUUUU X-CM-SenderInfo: 5olet0hnxqqx5xdzvxpfor3voofrz/1tbiAgAQBWeQpvkOyAAAs5 Content-Type: text/plain; charset="utf-8" From: Baokun Li EXT4_FLAGS_EMERGENCY_RO Indicates that the current file system has become read-only due to some error. Compared to SB_RDONLY, setting it does not require a lock because we won't clear it, which avoids over-coupling with vfs freeze. Also, add a helper function ext4_emergency_ro() to check if the bit is set. Signed-off-by: Baokun Li Reviewed-by: Jan Kara Reviewed-by: Zhang Yi --- fs/ext4/ext4.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index 4491e82cfa6f..207510b0b0af 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -2237,6 +2237,7 @@ enum { EXT4_FLAGS_RESIZING, /* Avoid superblock update and resize race */ EXT4_FLAGS_SHUTDOWN, /* Prevent access to the file system */ EXT4_FLAGS_BDEV_IS_DAX, /* Current block device support DAX */ + EXT4_FLAGS_EMERGENCY_RO,/* Emergency read-only due to fs errors */ }; =20 static inline int ext4_forced_shutdown(struct super_block *sb) @@ -2244,6 +2245,11 @@ static inline int ext4_forced_shutdown(struct super_= block *sb) return test_bit(EXT4_FLAGS_SHUTDOWN, &EXT4_SB(sb)->s_ext4_flags); } =20 +static inline int ext4_emergency_ro(struct super_block *sb) +{ + return test_bit(EXT4_FLAGS_EMERGENCY_RO, &EXT4_SB(sb)->s_ext4_flags); +} + /* * Default values for user and/or group using reserved blocks */ --=20 2.39.2 From nobody Fri Dec 19 21:50:51 2025 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4556A21148E; Wed, 22 Jan 2025 11:47:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.56 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737546447; cv=none; b=cmGXgJUA68WF7RbsT0nhWpAgeLt/gNWhEpPEfEDKNZolIMUoD+Shx1XVbEXdbcBjvu51WiXxglM+BCwuhYjaK6i/IcSxCKbjNczjWEFhSBXT1oZr52xNIqCdKnA61MbHUz+LuTgVWvaGjdJw8C2wZMjzBIHP2CKrpWH5mGaypH0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737546447; c=relaxed/simple; bh=YeW0kUywAKKuDglnilJncLFJ5vdWlH2wRjLvydybUHI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Kuhr9yI3eRrByLmWs3iXLfmD7vi1tqINqek4S+161QabH8T+CCh0p8We33e3UXdGLKZg2wNjZ3Uou/wNaK4IzZOUuwjwVTTWzR4fCOiBMWRSLahKXISL5eJkof/0QANqTseqQzMi0ht+hW4r1lsioL3ScFgCKRe7DsWy9DqoUmY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com; spf=pass smtp.mailfrom=huaweicloud.com; arc=none smtp.client-ip=45.249.212.56 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huaweicloud.com Received: from mail.maildlp.com (unknown [172.19.163.216]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4YdMkD5zHkz4f3jY1; Wed, 22 Jan 2025 19:47:00 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.128]) by mail.maildlp.com (Postfix) with ESMTP id 7394D1A08FC; Wed, 22 Jan 2025 19:47:21 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.104.67]) by APP4 (Coremail) with SMTP id gCh0CgD3Wl_F2pBn0KiuBg--.48765S7; Wed, 22 Jan 2025 19:47:21 +0800 (CST) From: libaokun@huaweicloud.com To: linux-ext4@vger.kernel.org Cc: tytso@mit.edu, adilger.kernel@dilger.ca, jack@suse.cz, linux-kernel@vger.kernel.org, yi.zhang@huawei.com, yangerkun@huawei.com, libaokun@huaweicloud.com, Baokun Li Subject: [PATCH v2 3/7] ext4: add ext4_emergency_state() helper function Date: Wed, 22 Jan 2025 19:41:26 +0800 Message-Id: <20250122114130.229709-4-libaokun@huaweicloud.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20250122114130.229709-1-libaokun@huaweicloud.com> References: <20250122114130.229709-1-libaokun@huaweicloud.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: gCh0CgD3Wl_F2pBn0KiuBg--.48765S7 X-Coremail-Antispam: 1UD129KBjvAXoW3KF47JF4DCry3XF4UurWkXrb_yoW8XFWxuo WFvF12qFyIka9xtayIkw18tFyUX39xCw4rC3s8ZF4qgryYyrn8uw17Aw17W3W3Ww4rXFW3 J34xJa1UXF4kZrW5n29KB7ZKAUJUUUU8529EdanIXcx71UUUUU7v73VFW2AGmfu7bjvjm3 AaLaJ3UjIYCTnIWjp_UUUOY7AC8VAFwI0_Wr0E3s1l1xkIjI8I6I8E6xAIw20EY4v20xva j40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l82xGYIkIc2x26280x7IE14v26r1rM28IrcIa0x kI8VCY1x0267AKxVW5JVCq3wA2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK021l84AC jcxK6xIIjxv20xvE14v26F1j6w1UM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26F4j6r4UJw A2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2z280aVCY1x0267AKxVW0oVCq3wAS 0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2 IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0 Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2IErcIFxwAKzVCY07xG64k0F24lc7CjxV Aaw2AFwI0_Jw0_GFyl42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2Iq xVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r 1q6r43MIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY 6xkF7I0E14v26r4j6F4UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67 AKxVW8JVWxJwCI42IY6I8E87Iv6xkF7I0E14v26r4UJVWxJrUvcSsGvfC2KfnxnUUI43ZE Xa7VUbqQ6JUUUUU== X-CM-SenderInfo: 5olet0hnxqqx5xdzvxpfor3voofrz/1tbiAQAQBWeQpvMO6wAAsT Content-Type: text/plain; charset="utf-8" From: Baokun Li Since both SHUTDOWN and EMERGENCY_RO are emergency states of the ext4 file system, and they are checked in similar locations, we have added a helper function, ext4_emergency_state(), to determine whether the current file system is in one of these two emergency states. Then, replace calls to ext4_forced_shutdown() with ext4_emergency_state() in those functions that could potentially trigger write operations. Signed-off-by: Baokun Li Reviewed-by: Jan Kara Reviewed-by: Zhang Yi --- fs/ext4/ext4.h | 9 +++++++++ fs/ext4/ext4_jbd2.c | 6 ++++-- fs/ext4/file.c | 24 ++++++++++++++++------- fs/ext4/fsync.c | 12 ++++-------- fs/ext4/ialloc.c | 5 +++-- fs/ext4/inline.c | 2 +- fs/ext4/inode.c | 47 ++++++++++++++++++++++++++------------------- fs/ext4/mballoc.c | 4 ++-- fs/ext4/mmp.c | 2 +- fs/ext4/namei.c | 20 +++++++++++-------- fs/ext4/page-io.c | 2 +- fs/ext4/super.c | 19 +++++++++--------- 12 files changed, 91 insertions(+), 61 deletions(-) diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index 207510b0b0af..3b0320c32e76 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -2250,6 +2250,15 @@ static inline int ext4_emergency_ro(struct super_blo= ck *sb) return test_bit(EXT4_FLAGS_EMERGENCY_RO, &EXT4_SB(sb)->s_ext4_flags); } =20 +static inline int ext4_emergency_state(struct super_block *sb) +{ + if (unlikely(ext4_forced_shutdown(sb))) + return -EIO; + if (unlikely(ext4_emergency_ro(sb))) + return -EROFS; + return 0; +} + /* * Default values for user and/or group using reserved blocks */ diff --git a/fs/ext4/ext4_jbd2.c b/fs/ext4/ext4_jbd2.c index da4a82456383..4e3bd4910f48 100644 --- a/fs/ext4/ext4_jbd2.c +++ b/fs/ext4/ext4_jbd2.c @@ -63,12 +63,14 @@ static void ext4_put_nojournal(handle_t *handle) */ static int ext4_journal_check_start(struct super_block *sb) { + int ret; journal_t *journal; =20 might_sleep(); =20 - if (unlikely(ext4_forced_shutdown(sb))) - return -EIO; + ret =3D ext4_emergency_state(sb); + if (unlikely(ret)) + return ret; =20 if (WARN_ON_ONCE(sb_rdonly(sb))) return -EROFS; diff --git a/fs/ext4/file.c b/fs/ext4/file.c index a5205149adba..d0c21e6503c6 100644 --- a/fs/ext4/file.c +++ b/fs/ext4/file.c @@ -688,10 +688,12 @@ ext4_dax_write_iter(struct kiocb *iocb, struct iov_it= er *from) static ssize_t ext4_file_write_iter(struct kiocb *iocb, struct iov_iter *from) { + int ret; struct inode *inode =3D file_inode(iocb->ki_filp); =20 - if (unlikely(ext4_forced_shutdown(inode->i_sb))) - return -EIO; + ret =3D ext4_emergency_state(inode->i_sb); + if (unlikely(ret)) + return ret; =20 #ifdef CONFIG_FS_DAX if (IS_DAX(inode)) @@ -700,7 +702,6 @@ ext4_file_write_iter(struct kiocb *iocb, struct iov_ite= r *from) =20 if (iocb->ki_flags & IOCB_ATOMIC) { size_t len =3D iov_iter_count(from); - int ret; =20 if (len < EXT4_SB(inode->i_sb)->s_awu_min || len > EXT4_SB(inode->i_sb)->s_awu_max) @@ -803,11 +804,16 @@ static const struct vm_operations_struct ext4_file_vm= _ops =3D { =20 static int ext4_file_mmap(struct file *file, struct vm_area_struct *vma) { + int ret; struct inode *inode =3D file->f_mapping->host; struct dax_device *dax_dev =3D EXT4_SB(inode->i_sb)->s_daxdev; =20 - if (unlikely(ext4_forced_shutdown(inode->i_sb))) - return -EIO; + if (file->f_mode & FMODE_WRITE) + ret =3D ext4_emergency_state(inode->i_sb); + else + ret =3D ext4_forced_shutdown(inode->i_sb) ? -EIO : 0; + if (unlikely(ret)) + return ret; =20 /* * We don't support synchronous mappings for non-DAX files and @@ -881,8 +887,12 @@ static int ext4_file_open(struct inode *inode, struct = file *filp) { int ret; =20 - if (unlikely(ext4_forced_shutdown(inode->i_sb))) - return -EIO; + if (filp->f_mode & FMODE_WRITE) + ret =3D ext4_emergency_state(inode->i_sb); + else + ret =3D ext4_forced_shutdown(inode->i_sb) ? -EIO : 0; + if (unlikely(ret)) + return ret; =20 ret =3D ext4_sample_last_mounted(inode->i_sb, filp->f_path.mnt); if (ret) diff --git a/fs/ext4/fsync.c b/fs/ext4/fsync.c index b40d3b29f7e5..e476c6de3074 100644 --- a/fs/ext4/fsync.c +++ b/fs/ext4/fsync.c @@ -132,20 +132,16 @@ int ext4_sync_file(struct file *file, loff_t start, l= off_t end, int datasync) bool needs_barrier =3D false; struct inode *inode =3D file->f_mapping->host; =20 - if (unlikely(ext4_forced_shutdown(inode->i_sb))) - return -EIO; + ret =3D ext4_emergency_state(inode->i_sb); + if (unlikely(ret)) + return ret; =20 ASSERT(ext4_journal_current_handle() =3D=3D NULL); =20 trace_ext4_sync_file_enter(file, datasync); =20 - if (sb_rdonly(inode->i_sb)) { - /* Make sure that we read updated s_ext4_flags value */ - smp_rmb(); - if (ext4_forced_shutdown(inode->i_sb)) - ret =3D -EROFS; + if (sb_rdonly(inode->i_sb)) goto out; - } =20 if (!EXT4_SB(inode->i_sb)->s_journal) { ret =3D ext4_fsync_nojournal(file, start, end, datasync, diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c index 21d228073d79..a5e5c3dc1d70 100644 --- a/fs/ext4/ialloc.c +++ b/fs/ext4/ialloc.c @@ -951,8 +951,9 @@ struct inode *__ext4_new_inode(struct mnt_idmap *idmap, sb =3D dir->i_sb; sbi =3D EXT4_SB(sb); =20 - if (unlikely(ext4_forced_shutdown(sb))) - return ERR_PTR(-EIO); + ret2 =3D ext4_emergency_state(sb); + if (unlikely(ret2)) + return ERR_PTR(ret2); =20 ngroups =3D ext4_get_groups_count(sb); trace_ext4_request_inode(dir, mode); diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c index 3536ca7e4fcc..1fe8a566ea0b 100644 --- a/fs/ext4/inline.c +++ b/fs/ext4/inline.c @@ -228,7 +228,7 @@ static void ext4_write_inline_data(struct inode *inode,= struct ext4_iloc *iloc, struct ext4_inode *raw_inode; int cp_len =3D 0; =20 - if (unlikely(ext4_forced_shutdown(inode->i_sb))) + if (unlikely(ext4_emergency_state(inode->i_sb))) return; =20 BUG_ON(!EXT4_I(inode)->i_inline_off); diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 36b1f9fb690a..74f5daac9637 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -1149,8 +1149,9 @@ static int ext4_write_begin(struct file *file, struct= address_space *mapping, pgoff_t index; unsigned from, to; =20 - if (unlikely(ext4_forced_shutdown(inode->i_sb))) - return -EIO; + ret =3D ext4_emergency_state(inode->i_sb); + if (unlikely(ret)) + return ret; =20 trace_ext4_write_begin(inode, pos, len); /* @@ -2273,7 +2274,7 @@ static int mpage_map_and_submit_extent(handle_t *hand= le, if (err < 0) { struct super_block *sb =3D inode->i_sb; =20 - if (ext4_forced_shutdown(sb)) + if (ext4_emergency_state(sb)) goto invalidate_dirty_pages; /* * Let the uper layers retry transient errors. @@ -2599,10 +2600,9 @@ static int ext4_do_writepages(struct mpage_da_data *= mpd) * *never* be called, so if that ever happens, we would want * the stack trace. */ - if (unlikely(ext4_forced_shutdown(mapping->host->i_sb))) { - ret =3D -EROFS; + ret =3D ext4_emergency_state(mapping->host->i_sb); + if (unlikely(ret)) goto out_writepages; - } =20 /* * If we have inline data and arrive here, it means that @@ -2817,8 +2817,9 @@ static int ext4_writepages(struct address_space *mapp= ing, int ret; int alloc_ctx; =20 - if (unlikely(ext4_forced_shutdown(sb))) - return -EIO; + ret =3D ext4_emergency_state(sb); + if (unlikely(ret)) + return ret; =20 alloc_ctx =3D ext4_writepages_down_read(sb); ret =3D ext4_do_writepages(&mpd); @@ -2858,8 +2859,9 @@ static int ext4_dax_writepages(struct address_space *= mapping, struct inode *inode =3D mapping->host; int alloc_ctx; =20 - if (unlikely(ext4_forced_shutdown(inode->i_sb))) - return -EIO; + ret =3D ext4_emergency_state(inode->i_sb); + if (unlikely(ret)) + return ret; =20 alloc_ctx =3D ext4_writepages_down_read(inode->i_sb); trace_ext4_writepages(inode, wbc); @@ -2915,8 +2917,9 @@ static int ext4_da_write_begin(struct file *file, str= uct address_space *mapping, pgoff_t index; struct inode *inode =3D mapping->host; =20 - if (unlikely(ext4_forced_shutdown(inode->i_sb))) - return -EIO; + ret =3D ext4_emergency_state(inode->i_sb); + if (unlikely(ret)) + return ret; =20 index =3D pos >> PAGE_SHIFT; =20 @@ -5228,8 +5231,9 @@ int ext4_write_inode(struct inode *inode, struct writ= eback_control *wbc) if (WARN_ON_ONCE(current->flags & PF_MEMALLOC)) return 0; =20 - if (unlikely(ext4_forced_shutdown(inode->i_sb))) - return -EIO; + err =3D ext4_emergency_state(inode->i_sb); + if (unlikely(err)) + return err; =20 if (EXT4_SB(inode->i_sb)->s_journal) { if (ext4_journal_current_handle()) { @@ -5351,8 +5355,9 @@ int ext4_setattr(struct mnt_idmap *idmap, struct dent= ry *dentry, const unsigned int ia_valid =3D attr->ia_valid; bool inc_ivers =3D true; =20 - if (unlikely(ext4_forced_shutdown(inode->i_sb))) - return -EIO; + error =3D ext4_emergency_state(inode->i_sb); + if (unlikely(error)) + return error; =20 if (unlikely(IS_IMMUTABLE(inode))) return -EPERM; @@ -5796,9 +5801,10 @@ int ext4_mark_iloc_dirty(handle_t *handle, { int err =3D 0; =20 - if (unlikely(ext4_forced_shutdown(inode->i_sb))) { + err =3D ext4_emergency_state(inode->i_sb); + if (unlikely(err)) { put_bh(iloc->bh); - return -EIO; + return err; } ext4_fc_track_inode(handle, inode); =20 @@ -5822,8 +5828,9 @@ ext4_reserve_inode_write(handle_t *handle, struct ino= de *inode, { int err; =20 - if (unlikely(ext4_forced_shutdown(inode->i_sb))) - return -EIO; + err =3D ext4_emergency_state(inode->i_sb); + if (unlikely(err)) + return err; =20 err =3D ext4_get_inode_loc(inode, iloc); if (!err) { diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index b25a27c86696..a67c52063a42 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -5653,7 +5653,7 @@ static inline void ext4_mb_show_pa(struct super_block= *sb) { ext4_group_t i, ngroups; =20 - if (ext4_forced_shutdown(sb)) + if (ext4_emergency_state(sb)) return; =20 ngroups =3D ext4_get_groups_count(sb); @@ -5687,7 +5687,7 @@ static void ext4_mb_show_ac(struct ext4_allocation_co= ntext *ac) { struct super_block *sb =3D ac->ac_sb; =20 - if (ext4_forced_shutdown(sb)) + if (ext4_emergency_state(sb)) return; =20 mb_debug(sb, "Can't allocate:" diff --git a/fs/ext4/mmp.c b/fs/ext4/mmp.c index d64c04ed061a..af6b3b746fe5 100644 --- a/fs/ext4/mmp.c +++ b/fs/ext4/mmp.c @@ -162,7 +162,7 @@ static int kmmpd(void *data) memcpy(mmp->mmp_nodename, init_utsname()->nodename, sizeof(mmp->mmp_nodename)); =20 - while (!kthread_should_stop() && !ext4_forced_shutdown(sb)) { + while (!kthread_should_stop() && !ext4_emergency_state(sb)) { if (!ext4_has_feature_mmp(sb)) { ext4_warning(sb, "kmmpd being stopped since MMP feature" " has been disabled."); diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index 536d56d15072..dead385bb164 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c @@ -3151,8 +3151,9 @@ static int ext4_rmdir(struct inode *dir, struct dentr= y *dentry) struct ext4_dir_entry_2 *de; handle_t *handle =3D NULL; =20 - if (unlikely(ext4_forced_shutdown(dir->i_sb))) - return -EIO; + retval =3D ext4_emergency_state(dir->i_sb); + if (unlikely(retval)) + return retval; =20 /* Initialize quotas before so that eventual writes go in * separate transaction */ @@ -3309,8 +3310,9 @@ static int ext4_unlink(struct inode *dir, struct dent= ry *dentry) { int retval; =20 - if (unlikely(ext4_forced_shutdown(dir->i_sb))) - return -EIO; + retval =3D ext4_emergency_state(dir->i_sb); + if (unlikely(retval)) + return retval; =20 trace_ext4_unlink_enter(dir, dentry); /* @@ -3376,8 +3378,9 @@ static int ext4_symlink(struct mnt_idmap *idmap, stru= ct inode *dir, struct fscrypt_str disk_link; int retries =3D 0; =20 - if (unlikely(ext4_forced_shutdown(dir->i_sb))) - return -EIO; + err =3D ext4_emergency_state(dir->i_sb); + if (unlikely(err)) + return err; =20 err =3D fscrypt_prepare_symlink(dir, symname, len, dir->i_sb->s_blocksize, &disk_link); @@ -4199,8 +4202,9 @@ static int ext4_rename2(struct mnt_idmap *idmap, { int err; =20 - if (unlikely(ext4_forced_shutdown(old_dir->i_sb))) - return -EIO; + err =3D ext4_emergency_state(old_dir->i_sb); + if (unlikely(err)) + return err; =20 if (flags & ~(RENAME_NOREPLACE | RENAME_EXCHANGE | RENAME_WHITEOUT)) return -EINVAL; diff --git a/fs/ext4/page-io.c b/fs/ext4/page-io.c index 31d8963a3fd6..24829b71e05e 100644 --- a/fs/ext4/page-io.c +++ b/fs/ext4/page-io.c @@ -198,7 +198,7 @@ static int ext4_end_io_end(ext4_io_end_t *io_end) } else { ret =3D ext4_convert_unwritten_io_end_vec(handle, io_end); } - if (ret < 0 && !ext4_forced_shutdown(sb) && + if (ret < 0 && !ext4_emergency_state(sb) && io_end->flag & EXT4_IO_END_UNWRITTEN) { ext4_msg(sb, KERN_EMERG, "failed to convert unwritten extents to written " diff --git a/fs/ext4/super.c b/fs/ext4/super.c index ca1ecafd48c5..4b089a5b760a 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -819,7 +819,7 @@ void __ext4_error(struct super_block *sb, const char *f= unction, struct va_format vaf; va_list args; =20 - if (unlikely(ext4_forced_shutdown(sb))) + if (unlikely(ext4_emergency_state(sb))) return; =20 trace_ext4_error(sb, function, line); @@ -844,7 +844,7 @@ void __ext4_error_inode(struct inode *inode, const char= *function, va_list args; struct va_format vaf; =20 - if (unlikely(ext4_forced_shutdown(inode->i_sb))) + if (unlikely(ext4_emergency_state(inode->i_sb))) return; =20 trace_ext4_error(inode->i_sb, function, line); @@ -879,7 +879,7 @@ void __ext4_error_file(struct file *file, const char *f= unction, struct inode *inode =3D file_inode(file); char pathname[80], *path; =20 - if (unlikely(ext4_forced_shutdown(inode->i_sb))) + if (unlikely(ext4_emergency_state(inode->i_sb))) return; =20 trace_ext4_error(inode->i_sb, function, line); @@ -959,7 +959,7 @@ void __ext4_std_error(struct super_block *sb, const cha= r *function, char nbuf[16]; const char *errstr; =20 - if (unlikely(ext4_forced_shutdown(sb))) + if (unlikely(ext4_emergency_state(sb))) return; =20 /* Special case: if the error is EROFS, and we're not already @@ -1053,7 +1053,7 @@ __acquires(bitlock) struct va_format vaf; va_list args; =20 - if (unlikely(ext4_forced_shutdown(sb))) + if (unlikely(ext4_emergency_state(sb))) return; =20 trace_ext4_error(sb, function, line); @@ -6343,8 +6343,9 @@ static int ext4_sync_fs(struct super_block *sb, int w= ait) bool needs_barrier =3D false; struct ext4_sb_info *sbi =3D EXT4_SB(sb); =20 - if (unlikely(ext4_forced_shutdown(sb))) - return -EIO; + ret =3D ext4_emergency_state(sb); + if (unlikely(ret)) + return ret; =20 trace_ext4_sync_fs(sb, wait); flush_workqueue(sbi->rsv_conversion_wq); @@ -6426,7 +6427,7 @@ static int ext4_freeze(struct super_block *sb) */ static int ext4_unfreeze(struct super_block *sb) { - if (ext4_forced_shutdown(sb)) + if (ext4_emergency_state(sb)) return 0; =20 if (EXT4_SB(sb)->s_journal) { @@ -6582,7 +6583,7 @@ static int __ext4_remount(struct fs_context *fc, stru= ct super_block *sb) flush_work(&sbi->s_sb_upd_work); =20 if ((bool)(fc->sb_flags & SB_RDONLY) !=3D sb_rdonly(sb)) { - if (ext4_forced_shutdown(sb)) { + if (ext4_emergency_state(sb)) { err =3D -EROFS; goto restore_opts; } --=20 2.39.2 From nobody Fri Dec 19 21:50:51 2025 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A4101213259; Wed, 22 Jan 2025 11:47:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737546452; cv=none; b=uJD466oIlgtmyaH2TQVI63/Y/4EBrVde/FBASoDoiXRjAyp4Il7tJ++ZOKeYwSUK++SRszDXjzaikhEsA/0AChVAjn53xFjwUcPOwc8b/YLRJ/NsK5lwk+vmKAuaHIEL+PyMIB38B+VIgLO3jYabFZcDxtgTapdeZfCQ8MQcrJA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737546452; c=relaxed/simple; bh=Y5SLBH7WRj6oFXP6VqSS0YJXbX94IIpfq+HcBcgSuqY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=GXpILEbOVScsVfyrR/kNFIQgr+W8OqdwWKhvwBmboP4uE648ODVneWM9RqahLBjssGXTsVmaVdU28FtbFvjj64xv3QPHevE6/EWgHgrBuq81x4LbhHu2unHCJEv9oKgN74ym0oOqlg1gW4+i1BAk+WF24hSXQ3kgXP6YUwUxqKY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com; spf=none smtp.mailfrom=huaweicloud.com; arc=none smtp.client-ip=45.249.212.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=huaweicloud.com Received: from mail.maildlp.com (unknown [172.19.93.142]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4YdMkL2pm4z4f3jqr; Wed, 22 Jan 2025 19:47:06 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.128]) by mail.maildlp.com (Postfix) with ESMTP id D280D1A0DF0; Wed, 22 Jan 2025 19:47:21 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.104.67]) by APP4 (Coremail) with SMTP id gCh0CgD3Wl_F2pBn0KiuBg--.48765S8; Wed, 22 Jan 2025 19:47:21 +0800 (CST) From: libaokun@huaweicloud.com To: linux-ext4@vger.kernel.org Cc: tytso@mit.edu, adilger.kernel@dilger.ca, jack@suse.cz, linux-kernel@vger.kernel.org, yi.zhang@huawei.com, yangerkun@huawei.com, libaokun@huaweicloud.com, Baokun Li Subject: [PATCH v2 4/7] ext4: add more ext4_emergency_state() checks around sb_rdonly() Date: Wed, 22 Jan 2025 19:41:27 +0800 Message-Id: <20250122114130.229709-5-libaokun@huaweicloud.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20250122114130.229709-1-libaokun@huaweicloud.com> References: <20250122114130.229709-1-libaokun@huaweicloud.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: gCh0CgD3Wl_F2pBn0KiuBg--.48765S8 X-Coremail-Antispam: 1UD129KBjvJXoWxXr4UAw47uryfWryftryUtrb_yoWrXw1Dpr nYkFykZFWj9w1DuanrGF15XryFgw4IyFyUurW3ur1rXFyDtrn5AFsrtF1FvF17ZrW5Wr1x WF4jyrZrur47CrDanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPC14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2048vs2IY020E87I2jVAFwI0_JF0E3s1l82xGYI kIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2 z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Gr1j6F 4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2z280aVCY1x0267AKxVW0oVCq 3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7 IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r4U M4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2IErcIFxwAKzVCY07xG64k0F24lc7 CjxVAaw2AFwI0_Jw0_GFyl42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1l x2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14 v26r1q6r43MIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IY x2IY6xkF7I0E14v26r4j6F4UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87 Iv67AKxVW8JVWxJwCI42IY6I8E87Iv6xkF7I0E14v26r4UJVWxJrUvcSsGvfC2KfnxnUUI 43ZEXa7VUbT7KDUUUUU== X-CM-SenderInfo: 5olet0hnxqqx5xdzvxpfor3voofrz/1tbiAQAQBWeQpvMO7AAAsU Content-Type: text/plain; charset="utf-8" From: Baokun Li Some functions check sb_rdonly() to make sure the file system isn't modified after it's read-only. Since we also don't want the file system modified if it's in an emergency state (shutdown or emergency_ro), we're adding additional ext4_emergency_state() checks where sb_rdonly() is checked. Suggested-by: Jan Kara Signed-off-by: Baokun Li Reviewed-by: Zhang Yi Reviewed-by: Jan Kara --- fs/ext4/file.c | 3 ++- fs/ext4/ioctl.c | 2 +- fs/ext4/super.c | 26 +++++++++++++++----------- 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/fs/ext4/file.c b/fs/ext4/file.c index d0c21e6503c6..45fc6586d41b 100644 --- a/fs/ext4/file.c +++ b/fs/ext4/file.c @@ -844,7 +844,8 @@ static int ext4_sample_last_mounted(struct super_block = *sb, if (likely(ext4_test_mount_flag(sb, EXT4_MF_MNTDIR_SAMPLED))) return 0; =20 - if (sb_rdonly(sb) || !sb_start_intwrite_trylock(sb)) + if (ext4_emergency_state(sb) || sb_rdonly(sb) || + !sb_start_intwrite_trylock(sb)) return 0; =20 ext4_set_mount_flag(sb, EXT4_MF_MNTDIR_SAMPLED); diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c index 7b9ce71c1c81..0c5ce9c2cdfc 100644 --- a/fs/ext4/ioctl.c +++ b/fs/ext4/ioctl.c @@ -1705,7 +1705,7 @@ int ext4_update_overhead(struct super_block *sb, bool= force) { struct ext4_sb_info *sbi =3D EXT4_SB(sb); =20 - if (sb_rdonly(sb)) + if (ext4_emergency_state(sb) || sb_rdonly(sb)) return 0; if (!force && (sbi->s_overhead =3D=3D 0 || diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 4b089a5b760a..d8116c9c2bd0 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -473,8 +473,9 @@ static void ext4_maybe_update_superblock(struct super_b= lock *sb) __u64 lifetime_write_kbytes; __u64 diff_size; =20 - if (sb_rdonly(sb) || !(sb->s_flags & SB_ACTIVE) || - !journal || (journal->j_flags & JBD2_UNMOUNT)) + if (ext4_emergency_state(sb) || sb_rdonly(sb) || + !(sb->s_flags & SB_ACTIVE) || !journal || + journal->j_flags & JBD2_UNMOUNT) return; =20 now =3D ktime_get_real_seconds(); @@ -765,7 +766,8 @@ static void update_super_work(struct work_struct *work) * We use directly jbd2 functions here to avoid recursing back into * ext4 error handling code during handling of previous errors. */ - if (!sb_rdonly(sbi->s_sb) && journal) { + if (!ext4_emergency_state(sbi->s_sb) && + !sb_rdonly(sbi->s_sb) && journal) { struct buffer_head *sbh =3D sbi->s_sbh; bool call_notify_err =3D false; =20 @@ -1325,13 +1327,14 @@ static void ext4_put_super(struct super_block *sb) ext4_mb_release(sb); ext4_ext_release(sb); =20 - if (!sb_rdonly(sb) && !aborted) { - ext4_clear_feature_journal_needs_recovery(sb); - ext4_clear_feature_orphan_present(sb); - es->s_state =3D cpu_to_le16(sbi->s_mount_state); - } - if (!sb_rdonly(sb)) + if (!ext4_emergency_state(sb) && !sb_rdonly(sb)) { + if (!aborted) { + ext4_clear_feature_journal_needs_recovery(sb); + ext4_clear_feature_orphan_present(sb); + es->s_state =3D cpu_to_le16(sbi->s_mount_state); + } ext4_commit_super(sb); + } =20 ext4_group_desc_free(sbi); ext4_flex_groups_free(sbi); @@ -3699,7 +3702,8 @@ static int ext4_run_li_request(struct ext4_li_request= *elr) if (group >=3D elr->lr_next_group) { ret =3D 1; if (elr->lr_first_not_zeroed !=3D ngroups && - !sb_rdonly(sb) && test_opt(sb, INIT_INODE_TABLE)) { + !ext4_emergency_state(sb) && !sb_rdonly(sb) && + test_opt(sb, INIT_INODE_TABLE)) { elr->lr_next_group =3D elr->lr_first_not_zeroed; elr->lr_mode =3D EXT4_LI_MODE_ITABLE; ret =3D 0; @@ -4004,7 +4008,7 @@ int ext4_register_li_request(struct super_block *sb, goto out; } =20 - if (sb_rdonly(sb) || + if (ext4_emergency_state(sb) || sb_rdonly(sb) || (test_opt(sb, NO_PREFETCH_BLOCK_BITMAPS) && (first_not_zeroed =3D=3D ngroups || !test_opt(sb, INIT_INODE_TABLE))= )) goto out; --=20 2.39.2 From nobody Fri Dec 19 21:50:51 2025 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7AA4F2116E9; Wed, 22 Jan 2025 11:47:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.56 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737546448; cv=none; b=VbcXeLCgXlX6NhcUie6hKJr3kRib3/6h+wHpJKaBmfXvXKVfnu51KuG0QDmNy8xrvwU4NsZ3aB7m7jbtR7fVILM+Um2OBChXHw+9oDpOsimbnzL785qf8j8gm20QTExqFtVUcYQ4v2Sx+T9rQVwJjwXs1ZReMp1N8Rj94hFh7Yw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737546448; c=relaxed/simple; bh=7b5O0NvmGWMh8OnvqCD3BXSXC88ueUuHJtbapbt613I=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=krCsDM/Mr1plCNiBsGBjvhPfthAnOLg3uv2RF48xkUj7b3HElIXoZletllfyzqdBmq5KrgmN+zbQkZNSP9uMDWUtRY5sq9Pl6s8ETQAnyQJj3Rjh2t2UFvU2jllq3inGPhXJhJNL78Xf0BAZnQGHdlUF+xuE1t/rUNNpaVtJzSs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com; spf=pass smtp.mailfrom=huaweicloud.com; arc=none smtp.client-ip=45.249.212.56 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huaweicloud.com Received: from mail.maildlp.com (unknown [172.19.163.216]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4YdMkF4PTjz4f3jdH; Wed, 22 Jan 2025 19:47:01 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.128]) by mail.maildlp.com (Postfix) with ESMTP id 4040D1A08FC; Wed, 22 Jan 2025 19:47:22 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.104.67]) by APP4 (Coremail) with SMTP id gCh0CgD3Wl_F2pBn0KiuBg--.48765S9; Wed, 22 Jan 2025 19:47:22 +0800 (CST) From: libaokun@huaweicloud.com To: linux-ext4@vger.kernel.org Cc: tytso@mit.edu, adilger.kernel@dilger.ca, jack@suse.cz, linux-kernel@vger.kernel.org, yi.zhang@huawei.com, yangerkun@huawei.com, libaokun@huaweicloud.com, Baokun Li Subject: [PATCH v2 5/7] ext4: correct behavior under errors=remount-ro mode Date: Wed, 22 Jan 2025 19:41:28 +0800 Message-Id: <20250122114130.229709-6-libaokun@huaweicloud.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20250122114130.229709-1-libaokun@huaweicloud.com> References: <20250122114130.229709-1-libaokun@huaweicloud.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: gCh0CgD3Wl_F2pBn0KiuBg--.48765S9 X-Coremail-Antispam: 1UD129KBjvJXoWxArWfAFyUZw4fZr13Cr4fuFg_yoW5Gr47pF WfC3WkZFWvvF10939xWayxZay2ga1IkayUCr47C34xXrZ8Ar1fZF4xtF1YgFykWrZ7Xa45 Zr1xKrW7u3y3CrDanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPK14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2048vs2IY020E87I2jVAFwI0_JF0E3s1l82xGYI kIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2 z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Gr1j6F 4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2z280aVCY1x0267AKxVW0oVCq 3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7 IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r4U M4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2IErcIFxwAKzVCY07xG64k0F24lc7 CjxVAaw2AFwI0_Jw0_GFyl42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1l x2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14 v26r1q6r43MIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_JFI_Gr1lIxAIcVC0I7IY x2IY6xkF7I0E14v26F4j6r4UJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z2 80aVAFwI0_Gr0_Cr1lIxAIcVC2z280aVCY1x0267AKxVW8Jr0_Cr1UYxBIdaVFxhVjvjDU 0xZFpf9x0JU9Aw3UUUUU= X-CM-SenderInfo: 5olet0hnxqqx5xdzvxpfor3voofrz/1tbiAQAQBWeQpvMO7QABsU Content-Type: text/plain; charset="utf-8" From: Baokun Li And after commit 95257987a638 ("ext4: drop EXT4_MF_FS_ABORTED flag") in v6.6-rc1, the EXT4_FLAGS_SHUTDOWN bit is set in ext4_handle_error() under errors=3Dremount-ro mode. This causes the read to fail even when the error is triggered in errors=3Dremount-ro mode. To correct the behavior under errors=3Dremount-ro, EXT4_FLAGS_SHUTDOWN is replaced by the newly introduced EXT4_FLAGS_EMERGENCY_RO. This new flag only prevents writes, matching the previous behavior with SB_RDONLY. Fixes: 95257987a638 ("ext4: drop EXT4_MF_FS_ABORTED flag") Closes: https://lore.kernel.org/all/22d652f6-cb3c-43f5-b2fe-0a4bb6516a04@hu= awei.com/ Suggested-by: Jan Kara Signed-off-by: Baokun Li Reviewed-by: Zhang Yi Reviewed-by: Jan Kara --- fs/ext4/super.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/fs/ext4/super.c b/fs/ext4/super.c index d8116c9c2bd0..098e62727aec 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -708,11 +708,8 @@ static void ext4_handle_error(struct super_block *sb, = bool force_ro, int error, if (test_opt(sb, WARN_ON_ERROR)) WARN_ON_ONCE(1); =20 - if (!continue_fs && !sb_rdonly(sb)) { - set_bit(EXT4_FLAGS_SHUTDOWN, &EXT4_SB(sb)->s_ext4_flags); - if (journal) - jbd2_journal_abort(journal, -EIO); - } + if (!continue_fs && !ext4_emergency_ro(sb) && journal) + jbd2_journal_abort(journal, -EIO); =20 if (!bdev_read_only(sb->s_bdev)) { save_error_info(sb, error, ino, block, func, line); @@ -738,17 +735,17 @@ static void ext4_handle_error(struct super_block *sb,= bool force_ro, int error, sb->s_id); } =20 - if (sb_rdonly(sb) || continue_fs) + if (ext4_emergency_ro(sb) || continue_fs) return; =20 ext4_msg(sb, KERN_CRIT, "Remounting filesystem read-only"); /* - * EXT4_FLAGS_SHUTDOWN was set which stops all filesystem - * modifications. We don't set SB_RDONLY because that requires - * sb->s_umount semaphore and setting it without proper remount - * procedure is confusing code such as freeze_super() leading to - * deadlocks and other problems. + * We don't set SB_RDONLY because that requires sb->s_umount + * semaphore and setting it without proper remount procedure is + * confusing code such as freeze_super() leading to deadlocks + * and other problems. */ + set_bit(EXT4_FLAGS_EMERGENCY_RO, &EXT4_SB(sb)->s_ext4_flags); } =20 static void update_super_work(struct work_struct *work) --=20 2.39.2 From nobody Fri Dec 19 21:50:51 2025 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7A9F421148F; Wed, 22 Jan 2025 11:47:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.56 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737546447; cv=none; b=osmJb4BnURVWHzgNNLXFyDshIDEFAMdqWMSQksJbj5lZvA/4GM95YbmLG9FEBn8/ymDtbeQlMPUbkLbHbydrdY6rUuvOrh+NDG38h2BAE6ytT2whwCJs0E54stVdlXCNK6fQ1ikMAFe8cosTDXyd9yEf69+uFoRc0QemUYpSMcQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737546447; c=relaxed/simple; bh=aC7NhqVR69URa85LCzfWpHN8P8hxrKwqEoQe595K5NM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=itCnoHlCjLgyWRznpF6o4EM8atnx+9DAHHf+KJ7cXF5jVgzlFybq89gbyGO68URHV55lx0Qi8wldzdTrU07A+dVUUK+Gn/OggWjrXi8xJQD4efMFInKp1jVFqcYIEXiOvzKYs7TWTY1/zjZIOwAr/EKsoAQUcB1PEzlYI727nWc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com; spf=pass smtp.mailfrom=huaweicloud.com; arc=none smtp.client-ip=45.249.212.56 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huaweicloud.com Received: from mail.maildlp.com (unknown [172.19.163.235]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4YdMkG085hz4f3jdK; Wed, 22 Jan 2025 19:47:02 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.128]) by mail.maildlp.com (Postfix) with ESMTP id A074C1A0D8A; Wed, 22 Jan 2025 19:47:22 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.104.67]) by APP4 (Coremail) with SMTP id gCh0CgD3Wl_F2pBn0KiuBg--.48765S10; Wed, 22 Jan 2025 19:47:22 +0800 (CST) From: libaokun@huaweicloud.com To: linux-ext4@vger.kernel.org Cc: tytso@mit.edu, adilger.kernel@dilger.ca, jack@suse.cz, linux-kernel@vger.kernel.org, yi.zhang@huawei.com, yangerkun@huawei.com, libaokun@huaweicloud.com, Baokun Li Subject: [PATCH v2 6/7] ext4: show 'emergency_ro' when EXT4_FLAGS_EMERGENCY_RO is set Date: Wed, 22 Jan 2025 19:41:29 +0800 Message-Id: <20250122114130.229709-7-libaokun@huaweicloud.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20250122114130.229709-1-libaokun@huaweicloud.com> References: <20250122114130.229709-1-libaokun@huaweicloud.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: gCh0CgD3Wl_F2pBn0KiuBg--.48765S10 X-Coremail-Antispam: 1UD129KBjvJXoW7uF15Cryxur48Xw15JrW5ZFb_yoW8Jw48p3 ZYkwn7Gr9YvF18Ca17GayxZ34Fgw1SkayUWrWS9w45Kry5X34v9r12kryFgFW8urZ0g3s0 qF1I9ry7Zry5A37anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPK14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2048vs2IY020E87I2jVAFwI0_JF0E3s1l82xGYI kIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2 z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Gr1j6F 4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2z280aVCY1x0267AKxVW0oVCq 3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7 IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r4U M4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2IErcIFxwAKzVCY07xG64k0F24lc7 CjxVAaw2AFwI0_Jw0_GFyl42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1l x2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14 v26r1q6r43MIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_JFI_Gr1lIxAIcVC0I7IY x2IY6xkF7I0E14v26F4j6r4UJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z2 80aVAFwI0_Gr0_Cr1lIxAIcVC2z280aVCY1x0267AKxVW8Jr0_Cr1UYxBIdaVFxhVjvjDU 0xZFpf9x0JU9Aw3UUUUU= X-CM-SenderInfo: 5olet0hnxqqx5xdzvxpfor3voofrz/1tbiAgAQBWeQpvkOygAAs7 Content-Type: text/plain; charset="utf-8" From: Baokun Li After commit d3476f3dad4a ("ext4: don't set SB_RDONLY after filesystem errors") in v6.12-rc1, the 'errors=3Dremount-ro' mode no longer sets SB_RDONLY on errors, which results in us seeing the filesystem is still in rw state after errors. Therefore, after setting EXT4_FLAGS_EMERGENCY_RO, display the emergency_ro option so that users can query whether the current file system has become emergency read-only due to errors through commands such as 'mount' or 'cat /proc/fs/ext4/sdx/options'. Fixes: d3476f3dad4a ("ext4: don't set SB_RDONLY after filesystem errors") Signed-off-by: Baokun Li Reviewed-by: Jan Kara Reviewed-by: Zhang Yi --- fs/ext4/super.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 098e62727aec..06633d23d8b2 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -3044,6 +3044,9 @@ static int _ext4_show_options(struct seq_file *seq, s= truct super_block *sb, if (nodefs && !test_opt(sb, NO_PREFETCH_BLOCK_BITMAPS)) SEQ_OPTS_PUTS("prefetch_block_bitmaps"); =20 + if (ext4_emergency_ro(sb)) + SEQ_OPTS_PUTS("emergency_ro"); + ext4_show_quota_options(seq, sb); return 0; } --=20 2.39.2 From nobody Fri Dec 19 21:50:51 2025 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DB321212FAF; Wed, 22 Jan 2025 11:47:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.56 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737546450; cv=none; b=Lf7N9o2jaH3tUyTxojOEaBCFFhSPZyjhORz9k528JAS2l8e4t6Bw/fmsRCfmjdjUJPKJHk82u0ktHDsmEz3vjnfM11Nq89sCSGW0/9I5CizSXArDEOD4iuNZBI4O4Zeo6DKNxDHRJ7TKgtFyo9pwYTv+7GWp/FPiVEHyAQzLHMw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737546450; c=relaxed/simple; bh=j6qTMT797FB7cjz8C0On914Mr/mLnPGVSBK5jX13XZo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=kXOAtDAns6Tjs7KebzKXy2vPr3J+DRl6mdxnCkrnemuy4QeoDlZ/io/LjwVNmssFk1+bsEPbiAqK2fe/E8OxIhg9zLWX2zA+zix+DlUWZFI2fdZOEOtbL8c8RHNjhcHts9GDohK1r3BuUblNj2U4Qjf9Q45bypzoIjHZ8j0uqEY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com; spf=none smtp.mailfrom=huaweicloud.com; arc=none smtp.client-ip=45.249.212.56 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=huaweicloud.com Received: from mail.maildlp.com (unknown [172.19.163.216]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4YdMkG2wCDz4f3jdM; Wed, 22 Jan 2025 19:47:02 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.128]) by mail.maildlp.com (Postfix) with ESMTP id 0E85C1A13D9; Wed, 22 Jan 2025 19:47:23 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.104.67]) by APP4 (Coremail) with SMTP id gCh0CgD3Wl_F2pBn0KiuBg--.48765S11; Wed, 22 Jan 2025 19:47:22 +0800 (CST) From: libaokun@huaweicloud.com To: linux-ext4@vger.kernel.org Cc: tytso@mit.edu, adilger.kernel@dilger.ca, jack@suse.cz, linux-kernel@vger.kernel.org, yi.zhang@huawei.com, yangerkun@huawei.com, libaokun@huaweicloud.com, Baokun Li Subject: [PATCH v2 7/7] ext4: show 'shutdown' hint when ext4 is forced to shutdown Date: Wed, 22 Jan 2025 19:41:30 +0800 Message-Id: <20250122114130.229709-8-libaokun@huaweicloud.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20250122114130.229709-1-libaokun@huaweicloud.com> References: <20250122114130.229709-1-libaokun@huaweicloud.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: gCh0CgD3Wl_F2pBn0KiuBg--.48765S11 X-Coremail-Antispam: 1UD129KBjvdXoWrZr1fZF48GFWDuFWUKr1DGFg_yoWkAFgEv3 yfGan7XanxCFs2y3W8CFW5XrZ0kFs2vw15Wr93tryrXw15X3ykJF1DtrZ5Ar1rWaySgr98 AFs3ZF10qFy7ZjkaLaAFLSUrUUUUjb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbykFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI8067AKxVWUAVCq3wA2048vs2 IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28E F7xvwVC0I7IYx2IY67AKxVW7JVWDJwA2z4x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8Jr0_Cr 1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0D M2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjx v20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1l F7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20VAGYxC7M4kE6xkIj40Ew7xC0wCY1x 0262kKe7AKxVWUtVW8ZwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC2 0s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI 0_Jw0_GFylIxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUCVW8JwCI42IY6xIIjxv2 0xvEc7CjxVAFwI0_Cr0_Gr1UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87 Iv67AKxVW8JVWxJwCI42IY6I8E87Iv6xkF7I0E14v26r4UJVWxJrUvcSsGvfC2KfnxnUUI 43ZEXa7VUbT7KDUUUUU== X-CM-SenderInfo: 5olet0hnxqqx5xdzvxpfor3voofrz/1tbiAQAQBWeQpvMO7wAAsX Content-Type: text/plain; charset="utf-8" From: Baokun Li Now, if dmesg is cleared, we have no way of knowing if the file system has been shutdown. Moreover, ext4 allows directory reads even after the file system has been shutdown, so when reading a file returns -EIO, we cannot determine whether this is a hardware issue or if the file system has been shutdown. Therefore, when ext4 file system is shutdown, we're adding a 'shutdown' hint to commands like mount so users can easily check the file system's status. Signed-off-by: Baokun Li Reviewed-by: Jan Kara Reviewed-by: Zhang Yi --- fs/ext4/super.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 06633d23d8b2..7455e2559bc0 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -3047,6 +3047,9 @@ static int _ext4_show_options(struct seq_file *seq, s= truct super_block *sb, if (ext4_emergency_ro(sb)) SEQ_OPTS_PUTS("emergency_ro"); =20 + if (ext4_forced_shutdown(sb)) + SEQ_OPTS_PUTS("shutdown"); + ext4_show_quota_options(seq, sb); return 0; } --=20 2.39.2