[PATCH] ext4: Fix error code saved on super block during file system abort

Subsystems: ext4 file system, filesystems (vfs and infrastructure), the rest

STALE1768d LANDED

Landed in mainline as 124e7c61deb2 on 2021-11-04.

2 messages, 2 authors, 2021-11-04 · open the first message on its own page

[PATCH] ext4: Fix error code saved on super block during file system abort

From: Gabriel Krisman Bertazi <hidden>
Date: 2021-10-26 17:33:22

ext4_abort will eventually call ext4_errno_to_code, which translates the
errno to an EXT4_ERR specific error.  This means that ext4_abort expects
an errno.  By using EXT4_ERR_ here, it gets misinterpreted (as an errno),
and ends up saving EXT4_ERR_EBUSY on the superblock during an abort,
which makes no sense.

ESHUTDOWN will get properly translated to EXT4_ERR_SHUTDOWN, so use that
instead.

Signed-off-by: Gabriel Krisman Bertazi <redacted>
---
 fs/ext4/super.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 1a766c68a55e..cc158007c5dd 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -5829,7 +5829,7 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data)
 	}
 
 	if (ext4_test_mount_flag(sb, EXT4_MF_FS_ABORTED))
-		ext4_abort(sb, EXT4_ERR_ESHUTDOWN, "Abort forced by user");
+		ext4_abort(sb, ESHUTDOWN, "Abort forced by user");
 
 	sb->s_flags = (sb->s_flags & ~SB_POSIXACL) |
 		(test_opt(sb, POSIX_ACL) ? SB_POSIXACL : 0);
-- 
2.33.0

Re: [PATCH] ext4: Fix error code saved on super block during file system abort

From: "Theodore Ts'o" <tytso@mit.edu>
Date: 2021-11-04 14:48:32

On Tue, 26 Oct 2021 14:33:02 -0300, Gabriel Krisman Bertazi wrote:
ext4_abort will eventually call ext4_errno_to_code, which translates the
errno to an EXT4_ERR specific error.  This means that ext4_abort expects
an errno.  By using EXT4_ERR_ here, it gets misinterpreted (as an errno),
and ends up saving EXT4_ERR_EBUSY on the superblock during an abort,
which makes no sense.

ESHUTDOWN will get properly translated to EXT4_ERR_SHUTDOWN, so use that
instead.

[...]
Applied, thanks!

[1/1] ext4: Fix error code saved on super block during file system abort
      commit: 124e7c61deb27d758df5ec0521c36cf08d417f7a

Best regards,
-- 
Theodore Ts'o [off-list ref]
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help