Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ce2b8dd authored by Eric Biggers's avatar Eric Biggers Committed by Theodore Ts'o
Browse files

ext4: switch to fscrypt_prepare_setattr() 



Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent 89904275

fs/ext4/inode.c

+4 −8
Original line number Diff line number Diff line
@@ -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);