summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Biggers <ebiggers@google.com>2017-10-09 12:15:37 -0700
committerJaegeuk Kim <jaegeuk@kernel.org>2018-01-04 18:20:20 -0800
commit1034eeec516a7ff036c55e46ff9fe124584fdb82 (patch)
treefc5973d316600e4ca92a5ad748c78988d18e0f7c
parent32c0d3ae9d664766abf4e64f89398dcd92614b35 (diff)
fscrypt: remove ->is_encrypted()
Now that all callers of fscrypt_operations.is_encrypted() have been switched to IS_ENCRYPTED(), remove ->is_encrypted(). Reviewed-by: Chao Yu <yuchao0@huawei.com> Acked-by: Dave Chinner <dchinner@redhat.com> Signed-off-by: Eric Biggers <ebiggers@google.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
-rw-r--r--fs/f2fs/super.c2
-rw-r--r--include/linux/fscrypt.h1
2 files changed, 0 insertions, 3 deletions
diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index 76e2f1518224..07a5628a6779 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -1742,13 +1742,11 @@ static const struct fscrypt_operations f2fs_cryptops = {
.key_prefix = "f2fs:",
.get_context = f2fs_get_context,
.set_context = f2fs_set_context,
- .is_encrypted = f2fs_encrypted_inode,
.empty_dir = f2fs_empty_dir,
.max_namelen = f2fs_max_namelen,
};
#else
static const struct fscrypt_operations f2fs_cryptops = {
- .is_encrypted = f2fs_encrypted_inode,
};
#endif
diff --git a/include/linux/fscrypt.h b/include/linux/fscrypt.h
index 58663327f692..800e0f812f36 100644
--- a/include/linux/fscrypt.h
+++ b/include/linux/fscrypt.h
@@ -81,7 +81,6 @@ struct fscrypt_operations {
int (*get_context)(struct inode *, void *, size_t);
int (*set_context)(struct inode *, const void *, size_t, void *);
bool (*dummy_context)(struct inode *);
- bool (*is_encrypted)(struct inode *);
bool (*empty_dir)(struct inode *);
unsigned (*max_namelen)(struct inode *);
};