Forráskód Böngészése

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>
Eric Biggers 8 éve
szülő
commit
c250b7dd8e
2 módosított fájl, 2 hozzáadás és 2 törlés
  1. 1 1
      fs/ext4/super.c
  2. 1 1
      include/linux/fscrypt_common.h

+ 1 - 1
fs/ext4/super.c

@@ -1205,7 +1205,7 @@ retry:
 	return res;
 	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));
 	return DUMMY_ENCRYPTION_ENABLED(EXT4_SB(inode->i_sb));
 }
 }

+ 1 - 1
include/linux/fscrypt_common.h

@@ -77,7 +77,7 @@ struct fscrypt_operations {
 	const char *key_prefix;
 	const char *key_prefix;
 	int (*get_context)(struct inode *, void *, size_t);
 	int (*get_context)(struct inode *, void *, size_t);
 	int (*set_context)(struct inode *, const void *, size_t, void *);
 	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 (*is_encrypted)(struct inode *);
 	bool (*empty_dir)(struct inode *);
 	bool (*empty_dir)(struct inode *);
 	unsigned (*max_namelen)(struct inode *);
 	unsigned (*max_namelen)(struct inode *);