From: Eric Biggers <ebiggers@kernel.org>
To: linux-fscrypt@vger.kernel.org
Cc: linux-ext4@vger.kernel.org,
linux-f2fs-devel@lists.sourceforge.net,
linux-mtd@lists.infradead.org, ceph-devel@vger.kernel.org,
Jeff Layton <jlayton@kernel.org>
Subject: [RFC PATCH 3/8] ext4: remove some #ifdefs in ext4_xattr_credits_for_new_inode()
Date: Sun, 23 Aug 2020 23:17:07 -0700 [thread overview]
Message-ID: <20200824061712.195654-4-ebiggers@kernel.org> (raw)
In-Reply-To: <20200824061712.195654-1-ebiggers@kernel.org>
From: Eric Biggers <ebiggers@google.com>
We don't need #ifdefs for CONFIG_SECURITY and CONFIG_INTEGRITY;
IS_ENABLED() is sufficient.
Signed-off-by: Eric Biggers <ebiggers@google.com>
---
fs/ext4/ialloc.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c
index 0cc576005a923..3e9c50eb857be 100644
--- a/fs/ext4/ialloc.c
+++ b/fs/ext4/ialloc.c
@@ -763,13 +763,12 @@ static int ext4_xattr_credits_for_new_inode(struct inode *dir, mode_t mode,
}
#endif
-#ifdef CONFIG_SECURITY
- {
+ if (IS_ENABLED(CONFIG_SECURITY)) {
int num_security_xattrs = 1;
-#ifdef CONFIG_INTEGRITY
- num_security_xattrs++;
-#endif
+ if (IS_ENABLED(CONFIG_INTEGRITY))
+ num_security_xattrs++;
+
/*
* We assume that security xattrs are never more than 1k.
* In practice they are under 128 bytes.
@@ -779,7 +778,7 @@ static int ext4_xattr_credits_for_new_inode(struct inode *dir, mode_t mode,
NULL /* block_bh */, 1024,
true /* is_create */);
}
-#endif
+
if (encrypt)
nblocks += __ext4_xattr_set_credits(sb,
NULL /* inode */,
--
2.28.0
next prev parent reply other threads:[~2020-08-24 6:35 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-24 6:17 [RFC PATCH 0/8] fscrypt: avoid GFP_NOFS-unsafe key setup during transaction Eric Biggers
2020-08-24 6:17 ` [RFC PATCH 1/8] fscrypt: add fscrypt_prepare_new_inode() and fscrypt_set_context() Eric Biggers
2020-08-24 16:48 ` Jeff Layton
2020-08-24 18:21 ` Eric Biggers
2020-08-24 18:47 ` Jeff Layton
2020-08-24 19:02 ` Eric Biggers
2020-08-24 19:42 ` Jeff Layton
2020-08-24 20:49 ` Eric Biggers
2020-08-24 6:17 ` [RFC PATCH 2/8] ext4: factor out ext4_xattr_credits_for_new_inode() Eric Biggers
2020-08-24 6:17 ` Eric Biggers [this message]
2020-08-24 6:17 ` [RFC PATCH 4/8] ext4: use fscrypt_prepare_new_inode() and fscrypt_set_context() Eric Biggers
2020-08-24 6:17 ` [RFC PATCH 5/8] f2fs: " Eric Biggers
2020-08-24 6:17 ` [RFC PATCH 6/8] ubifs: " Eric Biggers
2020-08-24 6:17 ` [RFC PATCH 7/8] fscrypt: remove fscrypt_inherit_context() Eric Biggers
2020-08-24 6:17 ` [RFC PATCH 8/8] fscrypt: stop pretending that key setup is nofs-safe Eric Biggers
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=20200824061712.195654-4-ebiggers@kernel.org \
--to=ebiggers@kernel.org \
--cc=ceph-devel@vger.kernel.org \
--cc=jlayton@kernel.org \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-f2fs-devel@lists.sourceforge.net \
--cc=linux-fscrypt@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).