diff options
| author | Eric Biggers <ebiggers@google.com> | 2017-02-22 13:25:14 -0800 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2017-03-15 14:15:47 -0400 |
| commit | 94840e3c802daa1a62985957f36ac48faf8ceedd (patch) | |
| tree | 09901080ff440233d2c092bd51a2aa296a2d9710 /fs/crypto | |
| parent | 1b53cf9815bb4744958d41f3795d5d5a1d365e2d (diff) | |
| download | linux-94840e3c802daa1a62985957f36ac48faf8ceedd.tar.bz2 | |
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>
Diffstat (limited to 'fs/crypto')
| -rw-r--r-- | fs/crypto/policy.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/fs/crypto/policy.c b/fs/crypto/policy.c index 14b76da71269..4908906d54d5 100644 --- a/fs/crypto/policy.c +++ b/fs/crypto/policy.c @@ -33,17 +33,10 @@ static int create_encryption_context_from_policy(struct inode *inode, const struct fscrypt_policy *policy) { struct fscrypt_context ctx; - int res; if (!inode->i_sb->s_cop->set_context) return -EOPNOTSUPP; - if (inode->i_sb->s_cop->prepare_context) { - res = inode->i_sb->s_cop->prepare_context(inode); - if (res) - return res; - } - ctx.format = FS_ENCRYPTION_CONTEXT_FORMAT_V1; memcpy(ctx.master_key_descriptor, policy->master_key_descriptor, FS_KEY_DESCRIPTOR_SIZE); |