From 72f4574b8d4ceba24f522f772739a91aede08a94 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 12 Aug 2024 13:08:57 +0000 Subject: [PATCH] Revert "ext4: Send notifications on error" This reverts commit 9760c6ceb2a92c8b5e9ecd9d12c86469d9217f58 which is commit 9a089b21f79b47eed240d4da7ea0d049de7c9b4d upstream. It breaks the build due to other patches not being backported, so revert it as it is not needed in an Android kernel. Fixes: 9760c6ceb2a9 ("ext4: Send notifications on error") Change-Id: I95da56bf79ffde03437bc20f9b6435554d3cdb32 Signed-off-by: Greg Kroah-Hartman --- fs/ext4/super.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 8a3be3b063df..55af9897f65e 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -46,7 +46,6 @@ #include #include #include -#include #include "ext4.h" #include "ext4_extents.h" /* Needed for trace points definition */ @@ -700,7 +699,6 @@ 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); } @@ -732,7 +730,6 @@ 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); @@ -772,7 +769,6 @@ 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); @@ -841,7 +837,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); } @@ -865,7 +861,6 @@ 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;