From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Theodore Ts'o <tytso@mit•edu>
Cc: Eric Biggers <ebiggers@google•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: build warning after merge of the ext4 tree
Date: Fri, 20 May 2022 22:54:00 +1000 [thread overview]
Message-ID: <20220520225400.089f9d4a@canb.auug.org.au> (raw)
In-Reply-To: <20220520110313.48a824c4@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1944 bytes --]
Hi all,
On Fri, 20 May 2022 11:03:13 +1000 Stephen Rothwell <sfr@canb•auug.org.au> 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 <sfr@canb•auug.org.au>
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 <sfr@canb•auug.org.au>
---
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2022-05-20 12:54 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-20 1:03 linux-next: build warning after merge of the ext4 tree Stephen Rothwell
2022-05-20 6:35 ` Eric Biggers
2022-05-20 12:54 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-07-10 8:22 Stephen Rothwell
2024-07-30 10:06 ` Stephen Rothwell
2021-07-05 23:46 Stephen Rothwell
2018-10-09 23:11 Stephen Rothwell
2016-01-05 6:01 Stephen Rothwell
2011-01-10 1:10 Stephen Rothwell
2010-08-07 2:45 Stephen Rothwell
2010-08-07 6:47 ` Ted Ts'o
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220520225400.089f9d4a@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=ebiggers@google$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=tytso@mit$(echo .)edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox