diff options
| author | Eric Biggers <ebiggers@google.com> | 2018-01-05 10:44:57 -0800 |
|---|---|---|
| committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2018-04-08 02:09:17 -0700 |
| commit | efefa434f47e1d907b3a4c31b9c9f1e561fe57d6 (patch) | |
| tree | 4c7bd37b9a3aad1bef994c7bc1c7624402ae2515 | |
| parent | 7ed178bc8ae9eb13c0a0a155688e2a7187afd2bb (diff) | |
fscrypt: move fscrypt_operations declaration to fscrypt_supp.h
Filesystems now only define their fscrypt_operations when they are
compiled with encryption support, so move the fscrypt_operations
declaration from fscrypt.h to fscrypt_supp.h.
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
| -rw-r--r-- | include/linux/fscrypt.h | 18 | ||||
| -rw-r--r-- | include/linux/fscrypt_supp.h | 18 |
2 files changed, 18 insertions, 18 deletions
diff --git a/include/linux/fscrypt.h b/include/linux/fscrypt.h index fc43cc303cf2..b29cdfc3486e 100644 --- a/include/linux/fscrypt.h +++ b/include/linux/fscrypt.h @@ -53,24 +53,6 @@ struct fscrypt_name { #define fname_name(p) ((p)->disk_name.name) #define fname_len(p) ((p)->disk_name.len) -/* - * fscrypt superblock flags - */ -#define FS_CFLG_OWN_PAGES (1U << 1) - -/* - * crypto opertions for filesystems - */ -struct fscrypt_operations { - unsigned int flags; - const char *key_prefix; - int (*get_context)(struct inode *, void *, size_t); - int (*set_context)(struct inode *, const void *, size_t, void *); - bool (*dummy_context)(struct inode *); - bool (*empty_dir)(struct inode *); - unsigned (*max_namelen)(struct inode *); -}; - static inline bool fscrypt_valid_enc_modes(u32 contents_mode, u32 filenames_mode) { diff --git a/include/linux/fscrypt_supp.h b/include/linux/fscrypt_supp.h index 90965fa403b1..c785f7297f29 100644 --- a/include/linux/fscrypt_supp.h +++ b/include/linux/fscrypt_supp.h @@ -10,6 +10,24 @@ #ifndef _LINUX_FSCRYPT_SUPP_H #define _LINUX_FSCRYPT_SUPP_H +/* + * fscrypt superblock flags + */ +#define FS_CFLG_OWN_PAGES (1U << 1) + +/* + * crypto operations for filesystems + */ +struct fscrypt_operations { + unsigned int flags; + const char *key_prefix; + int (*get_context)(struct inode *, void *, size_t); + int (*set_context)(struct inode *, const void *, size_t, void *); + bool (*dummy_context)(struct inode *); + bool (*empty_dir)(struct inode *); + unsigned (*max_namelen)(struct inode *); +}; + struct fscrypt_ctx { union { struct { |