aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Biggers <ebiggers@google.com>2017-06-22 15:14:40 -0400
committerTheodore Ts'o <tytso@mit.edu>2017-06-23 20:11:50 -0400
commitc250b7dd8e73b5f7d88d231fbaac92e3360a7234 (patch)
tree01ac03eb6b218396684a906f208c57067bc8fcff
parentb7e7cf7a66a27e62c5f873a0068cee34094bf5d7 (diff)
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>
-rw-r--r--fs/ext4/super.c2
-rw-r--r--include/linux/fscrypt_common.h2
2 files changed, 2 insertions, 2 deletions
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:
1205 return res; 1205 return res;
1206} 1206}
1207 1207
1208static int ext4_dummy_context(struct inode *inode) 1208static bool ext4_dummy_context(struct inode *inode)
1209{ 1209{
1210 return DUMMY_ENCRYPTION_ENABLED(EXT4_SB(inode->i_sb)); 1210 return DUMMY_ENCRYPTION_ENABLED(EXT4_SB(inode->i_sb));
1211} 1211}
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 {
77 const char *key_prefix; 77 const char *key_prefix;
78 int (*get_context)(struct inode *, void *, size_t); 78 int (*get_context)(struct inode *, void *, size_t);
79 int (*set_context)(struct inode *, const void *, size_t, void *); 79 int (*set_context)(struct inode *, const void *, size_t, void *);
80 int (*dummy_context)(struct inode *); 80 bool (*dummy_context)(struct inode *);
81 bool (*is_encrypted)(struct inode *); 81 bool (*is_encrypted)(struct inode *);
82 bool (*empty_dir)(struct inode *); 82 bool (*empty_dir)(struct inode *);
83 unsigned (*max_namelen)(struct inode *); 83 unsigned (*max_namelen)(struct inode *);