]> git.itanic.dy.fi Git - linux-stable/commitdiff
ext4: replace read-only check for shutdown check in mmp code
authorJan Kara <jack@suse.cz>
Fri, 16 Jun 2023 16:50:57 +0000 (18:50 +0200)
committerTheodore Ts'o <tytso@mit.edu>
Sat, 29 Jul 2023 22:37:53 +0000 (18:37 -0400)
The multi-mount protection kthread checks for read-only filesystem and
aborts in that case. The remount code actually handles stopping of the
kthread on remount so the only purpose of the check is in case of
emergency remount read-only. Replace the check for read-only filesystem
with a check for shutdown filesystem as running MMP on such is risky
anyway and it makes ordering of things during remount simpler.

Signed-off-by: Jan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/20230616165109.21695-11-jack@suse.cz
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
fs/ext4/mmp.c

index 0aaf38ffcb6ec6600ae91b5bd41e2b6fe3fc501a..bd946d0c71b700f1eb19e6eb567081d845c4c7ea 100644 (file)
@@ -162,7 +162,7 @@ static int kmmpd(void *data)
        memcpy(mmp->mmp_nodename, init_utsname()->nodename,
               sizeof(mmp->mmp_nodename));
 
-       while (!kthread_should_stop() && !sb_rdonly(sb)) {
+       while (!kthread_should_stop() && !ext4_forced_shutdown(sb)) {
                if (!ext4_has_feature_mmp(sb)) {
                        ext4_warning(sb, "kmmpd being stopped since MMP feature"
                                     " has been disabled.");