Skip to contentSkip to conversation

fscrypt: make ->dummy_context() return bool

PATCH Applied Eric Biggers 2 participants 2 messages Jun 22, 2017 – Jun 24, 2017

Subsystems (2)
ext4 file system fscrypt: file system level encryption support
lore
Share & tools
lore

Eric Biggers

author
#0 lore raw

PATCH 1/1 fscrypt: make ->dummy_context() return bool

From: Eric Biggers <[email protected]>

This makes it consistent with ->is_encrypted(), ->empty_dir(), and fscrypt_dummy_context_enabled().

Signed-off-by Eric Biggers <[email protected]>
---
 fs/ext4/super.c                | 2 +-
 include/linux/fscrypt_common.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
fs/ext4/super.c +1 -1
index d46766a7c33e..8ca7e0f03596 100644
@@ -1219,7 +1219,7 @@ static int ext4_set_context(struct inode *inode, const void *ctx, size_t len,
 	return res;
 }
 
-static int ext4_dummy_context(struct inode *inode)
+static bool ext4_dummy_context(struct inode *inode)
 {
 	return DUMMY_ENCRYPTION_ENABLED(EXT4_SB(inode->i_sb));
 }
include/linux/fscrypt_common.h +1 -1
index 4022c61f7e9b..e3e1208e0f54 100644
@@ -77,7 +77,7 @@ struct fscrypt_operations {
 	const char *key_prefix;
 	int (*get_context)(struct inode *, void *, size_t);
 	int (*set_context)(struct inode *, const void *, size_t, void *);
-	int (*dummy_context)(struct inode *);
+	bool (*dummy_context)(struct inode *);
 	bool (*is_encrypted)(struct inode *);
 	bool (*empty_dir)(struct inode *);
 	unsigned (*max_namelen)(struct inode *);
Signature · 1 line
2.13.1.611.g7e3b11ae1-goog