diff mbox series

[RFC,3/8] ext4: remove some #ifdefs in ext4_xattr_credits_for_new_inode()

Message ID 20200824061712.195654-4-ebiggers@kernel.org (mailing list archive)
State Superseded
Headers show
Series fscrypt: avoid GFP_NOFS-unsafe key setup during transaction | expand

Commit Message

Eric Biggers Aug. 24, 2020, 6:17 a.m. UTC 
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 mbox series

Patch

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 */,