diff options
| author | Eric Biggers <ebiggers@google.com> | 2017-02-22 13:25:14 -0800 |
|---|---|---|
| committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2017-05-08 17:35:42 -0700 |
| commit | 0addb61dc70fff224c344a30bf38345d96ce7fdb (patch) | |
| tree | d25a1a609fd1182386ccfc30650d292acda2496f /include/linux | |
| parent | e9dbf926ed236a065dfd8a8f930564fe0f1f2b73 (diff) | |
fscrypt: eliminate ->prepare_context() operation
The only use of the ->prepare_context() fscrypt operation was to allow
ext4 to evict inline data from the inode before ->set_context().
However, there is no reason why this cannot be done as simply the first
step in ->set_context(), and in fact it makes more sense to do it that
way because then the policy modes and flags get validated before any
real work is done. Therefore, merge ext4_prepare_context() into
ext4_set_context(), and remove ->prepare_context().
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Conflicts:
fs/ext4/super.c
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/fscrypt_common.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/fscrypt_common.h b/include/linux/fscrypt_common.h index 547f81592ba1..10c1abfbac6c 100644 --- a/include/linux/fscrypt_common.h +++ b/include/linux/fscrypt_common.h @@ -87,7 +87,6 @@ struct fscrypt_operations { unsigned int flags; const char *key_prefix; int (*get_context)(struct inode *, void *, size_t); - int (*prepare_context)(struct inode *); int (*set_context)(struct inode *, const void *, size_t, void *); int (*dummy_context)(struct inode *); bool (*is_encrypted)(struct inode *); |