Subject: Re: linux-next: build warning after merge of the ext4 tree

From: Stephen Rothwell <[email-masked]>
Date: Fri, 20 May 2022 22:54:00 +1000

Hi all,

On Fri, 20 May 2022 11:03:13 +1000 Stephen Rothwell <[email-masked]> wrote:

> 
> After merging the ext4 tree, today's linux-next build (powerpc
> ppc64_defconfig) produced this warning:
> 
> fs/ext4/super.c: In function 'ext4_check_test_dummy_encryption':
> fs/ext4/super.c:2677:36: warning: unused variable 'sbi' [-Wunused-variable]
>  2677 |         const struct ext4_sb_info *sbi = EXT4_SB(sb);
>       |                                    ^~~
> 
> Introduced by commit
> 
>   0df27ddf69f3 ("ext4: only allow test_dummy_encryption when supported")

This becomes an error in an i386 defconfig build, so I have applied the
following hack for today.

From: Stephen Rothwell <[email-masked]>
Date: Fri, 20 May 2022 22:48:55 +1000
Subject: [PATCH] hack fixup for "ext4: only allow test_dummy_encryption when supported"

Signed-off-by: Stephen Rothwell <[email-masked]>
---
 fs/ext4/super.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 5168d894c41e..f9a3ad683b4a 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -2674,7 +2674,6 @@ static int ext4_check_test_dummy_encryption(const struct fs_context *fc,
 					    struct super_block *sb)
 {
 	const struct ext4_fs_context *ctx = fc->fs_private;
-	const struct ext4_sb_info *sbi = EXT4_SB(sb);
 
 	if (!IS_ENABLED(CONFIG_FS_ENCRYPTION) ||
 	    !(ctx->spec & EXT4_SPEC_DUMMY_ENCRYPTION))
@@ -2692,7 +2691,7 @@ static int ext4_check_test_dummy_encryption(const struct fs_context *fc,
 	 * it to be specified during remount, but only if there is no change.
 	 */
 	if (fc->purpose == FS_CONTEXT_FOR_RECONFIGURE &&
-	    !DUMMY_ENCRYPTION_ENABLED(sbi)) {
+	    !DUMMY_ENCRYPTION_ENABLED(EXT4_SB(sb))) {
 		ext4_msg(NULL, KERN_WARNING,
 			 "Can't set test_dummy_encryption on remount");
 		return -EINVAL;
-- 
2.35.1

-- 
Cheers,
Stephen Rothwell