Re: [PATCH 5.15 2/2] ext4: avoid remount errors with 'abort' mount option

[Sasha Levin <sashal@kernel.org>]

[ Sasha's backport helper bot ]

Hi,

✅ All tests passed successfully. No issues detected.
No action required from the submitter.

The upstream commit SHA1 provided is correct: 76486b104168ae59703190566e372badf433314b

WARNING: Author mismatch between patch and upstream commit:
Backport author: Amir Goldstein<amir73il@gmail.com>
Commit author: Jan Kara<jack@suse.cz>

Status in newer kernel trees:
6.15.y | Present (exact SHA1)
6.12.y | Present (different SHA1: 26cc5063e3c2)
6.6.y | Present (different SHA1: 6c63de9b4d0e)
6.1.y | Present (different SHA1: dfc2eb29016f)

Note: The patch differs from the upstream commit:
---
1:  76486b104168a ! 1:  73557e9fd536a ext4: avoid remount errors with 'abort' mount option
    @@
      ## Metadata ##
    -Author: Jan Kara <jack@suse.cz>
    +Author: Amir Goldstein <amir73il@gmail.com>
     
      ## Commit message ##
         ext4: avoid remount errors with 'abort' mount option
     
    +    [ Upstream commit 76486b104168ae59703190566e372badf433314b ]
    +
    +    [amir: backport to 5.15.y pre new mount api]
    +
         When we remount filesystem with 'abort' mount option while changing
         other mount options as well (as is LTP test doing), we can return error
         from the system call after commit d3476f3dad4a ("ext4: don't set
    @@ Commit message
         Tested-by: Jan Stancek <jstancek@redhat.com>
         Link: https://patch.msgid.link/20241004221556.19222-1-jack@suse.cz
         Signed-off-by: Theodore Ts'o <tytso@mit.edu>
    +    Signed-off-by: Amir Goldstein <amir73il@gmail.com>
     
      ## fs/ext4/super.c ##
    -@@ fs/ext4/super.c: static int __ext4_remount(struct fs_context *fc, struct super_block *sb)
    +@@ fs/ext4/super.c: static int ext4_remount(struct super_block *sb, int *flags, char *data)
      		goto restore_opts;
      	}
      
    @@ fs/ext4/super.c: static int __ext4_remount(struct fs_context *fc, struct super_b
      	sb->s_flags = (sb->s_flags & ~SB_POSIXACL) |
      		(test_opt(sb, POSIX_ACL) ? SB_POSIXACL : 0);
      
    -@@ fs/ext4/super.c: static int __ext4_remount(struct fs_context *fc, struct super_block *sb)
    - 	if (!ext4_has_feature_mmp(sb) || sb_rdonly(sb))
    - 		ext4_stop_mmpd(sbi);
    +@@ fs/ext4/super.c: static int ext4_remount(struct super_block *sb, int *flags, char *data)
    + 	 */
    + 	*flags = (*flags & ~vfs_flags) | (sb->s_flags & vfs_flags);
      
     +	/*
     +	 * Handle aborting the filesystem as the last thing during remount to
    @@ fs/ext4/super.c: static int __ext4_remount(struct fs_context *fc, struct super_b
     +	if (test_opt2(sb, ABORT))
     +		ext4_abort(sb, ESHUTDOWN, "Abort forced by user");
     +
    - 	return 0;
    - 
    - restore_opts:
    + 	ext4_msg(sb, KERN_INFO, "re-mounted. Opts: %s. Quota mode: %s.",
    + 		 orig_data, ext4_quota_mode(sb));
    + 	kfree(orig_data);
---

Results of testing on various branches:

| Branch                    | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-6.1.y        |  Success    |  Success   |