ext4: fix error code saved on super block during file system abort
Subsystems (2)
PATCH 1/1 ext4: fix error code saved on super block during file system abort
From: Gabriel Krisman Bertazi <[email protected]>
[ Upstream commit 124e7c61deb27d758df5ec0521c36cf08d417f7a ]
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
@@ -5820,7 +5820,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
cgit 1.2.3-korg
PATCH 1/1 ext4: Send notifications on error
From: Gabriel Krisman Bertazi <[email protected]>
[ Upstream commit 9a089b21f79b47eed240d4da7ea0d049de7c9b4d ]
Send a FS_ERROR message via fsnotify to a userspace monitoring tool whenever a ext4 error condition is triggered. This follows the existing error conditions in ext4, so it is hooked to the ext4_error* functions.
[Ajay: - Modified to apply on v5.10.y
- Added fsnotify for __ext4_abort()]
--- fs/ext4/super.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
fs/ext4/super.c +6 -1
@@ -46,6 +46,7 @@#include <linux/part_stat.h> #include <linux/kthread.h> #include <linux/freezer.h> +#include <linux/fsnotify.h> #include "ext4.h" #include "ext4_extents.h" /* Needed for trace points definition */
@@ -699,6 +700,7 @@ void __ext4_error(struct super_block *sb, const char *function, sb->s_id, function, line, current->comm, &vaf);va_end (args); } +fsnotify_sb_error (sb,NULL , error ? error :EFSCORRUPTED );save_error_info (sb, error,0 , block, function, line);ext4_handle_error (sb); }
@@ -730,6 +732,7 @@ void __ext4_error_inode(struct inode *inode, const char *function, current->comm, &vaf);va_end (args); } +fsnotify_sb_error (inode->i_sb, inode, error ? error :EFSCORRUPTED );save_error_info (inode->i_sb, error, inode->i_ino, block, function, line);ext4_handle_error (inode->i_sb);
@@ -769,6 +772,7 @@ void __ext4_error_file(struct file *file, const char *function, current->comm, path, &vaf);va_end (args); } +fsnotify_sb_error (inode->i_sb, inode,EFSCORRUPTED );save_error_info (inode->i_sb,EFSCORRUPTED , inode->i_ino, block, function, line);ext4_handle_error (inode->i_sb);
@@ -837,7 +841,7 @@ void __ext4_std_error(struct super_block *sb, const char *function,printk (KERN_CRIT "EXT4-fs error (device %s) in %s:%d: %s\n" , sb->s_id, function, line, errstr); } - +fsnotify_sb_error (sb,NULL , errno ? errno :EFSCORRUPTED );save_error_info (sb, -errno,0 ,0 , function, line);ext4_handle_error (sb); }
@@ -861,6 +865,7 @@ void __ext4_abort(struct super_block *sb, const char *function,if (unlikely (ext4_forced_shutdown (EXT4_SB (sb))))return ; +fsnotify_sb_error (sb,NULL , error ? error :EFSCORRUPTED );save_error_info (sb, error,0 ,0 , function, line);va_start (args, fmt); vaf.fmt = fmt;
Signature · 1 line
2.7.4
Greg KH
maintainerQuoted 10 lines · Ajay Kaher
From: Gabriel Krisman Bertazi <[email protected]>
[ Upstream commit
124e7c61deb27d758df5ec0521c36cf08d417f7a]
ext4_abortwill eventually callext4_errno_to_code, which translates the errno to anEXT4_ERRspecific error. This means thatext4_abortexpects an errno. By usingEXT4_ERR_here, it gets misinterpreted (as an errno), and ends up savingEXT4_ERR_EBUSYon the superblock during an abort, which makes no sense.
Quoted 8 lines
ESHUTDOWN will get properly translated to
EXT4_ERR_SHUTDOWN, so use that instead.Signed-off-by Gabriel Krisman Bertazi <[email protected]>Signed-off-by Theodore Ts'o <[email protected]>Signed-off-by Ajay Kaher <[email protected]>---
Both now queued up, thanks.
greg k-h