diff options
| author | Eric Biggers <ebiggers@google.com> | 2017-10-18 20:21:58 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2017-10-18 20:21:58 -0400 |
| commit | 3ce2b8ddd84d507c2be8eb687c38fee64fa02fdc (patch) | |
| tree | 7d21d3b38743c4f432b56cedb7dec6da636d6b65 /fs/ext4 | |
| parent | 8990427501a744c1d523a9da6123f60889efaa03 (diff) | |
| download | blackbird-obmc-linux-3ce2b8ddd84d507c2be8eb687c38fee64fa02fdc.tar.gz blackbird-obmc-linux-3ce2b8ddd84d507c2be8eb687c38fee64fa02fdc.zip | |
ext4: switch to fscrypt_prepare_setattr()
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'fs/ext4')
| -rw-r--r-- | fs/ext4/inode.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index d5a471939fbc..617c7feced24 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -5311,6 +5311,10 @@ int ext4_setattr(struct dentry *dentry, struct iattr *attr) if (error) return error; + error = fscrypt_prepare_setattr(dentry, attr); + if (error) + return error; + if (is_quota_modification(inode, attr)) { error = dquot_initialize(inode); if (error) @@ -5356,14 +5360,6 @@ int ext4_setattr(struct dentry *dentry, struct iattr *attr) loff_t oldsize = inode->i_size; int shrink = (attr->ia_size <= inode->i_size); - if (ext4_encrypted_inode(inode)) { - error = fscrypt_get_encryption_info(inode); - if (error) - return error; - if (!fscrypt_has_encryption_key(inode)) - return -ENOKEY; - } - if (!(ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS))) { struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb); |
