From: Eric Biggers <ebiggers@google.com>
Date: Thu, 22 Jun 2017 19:14:40 +0000 (-0700)
Subject: fscrypt: make ->dummy_context() return bool
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c250b7dd8e73b5f7d88d231fbaac92e3360a7234;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

fscrypt: make ->dummy_context() return bool

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

Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
---

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 0b177da9ea82..f01d2c5bc3fa 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -1205,7 +1205,7 @@ retry:
 	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));
 }
diff --git a/include/linux/fscrypt_common.h b/include/linux/fscrypt_common.h
index 4022c61f7e9b..e3e1208e0f54 100644
--- a/include/linux/fscrypt_common.h
+++ b/include/linux/fscrypt_common.h
@@ -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 *);