Skip to contentSkip to conversation

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

PATCH Applied Gabriel Krisman Bertazi 2 participants 2 messages Oct 26, 2021 – Nov 4, 2021 ext4 file system

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ext4: Fix error code saved on super block during file system abort

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.

---
 fs/ext4/super.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
fs/ext4/super.c +1 -1
index 1a766c68a55e..cc158007c5dd 100644
@@ -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);
Signature · 1 line
2.33.0
maintainer Applied
#1 lore raw
Quoted 10 lines · Gabriel Krisman Bertazi

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,

Signature · 1 line
Theodore Ts'o <[email protected]>