ubifs: switch to fscrypt_prepare_setattr()
authorEric Biggers <ebiggers@google.com>
Wed, 29 Nov 2017 20:43:17 +0000 (12:43 -0800)
committerRichard Weinberger <richard@nod.at>
Wed, 17 Jan 2018 20:48:05 +0000 (21:48 +0100)
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
fs/ubifs/file.c

index 3a3cdafaab45030e7c2fc25f6e68a93a65960078..9fe194a4fa9ba5a80aa36ff3b37fa4ec78452544 100644 (file)
@@ -1284,13 +1284,9 @@ int ubifs_setattr(struct dentry *dentry, struct iattr *attr)
        if (err)
                return err;
 
-       if (ubifs_crypt_is_encrypted(inode) && (attr->ia_valid & ATTR_SIZE)) {
-               err = fscrypt_get_encryption_info(inode);
-               if (err)
-                       return err;
-               if (!fscrypt_has_encryption_key(inode))
-                       return -ENOKEY;
-       }
+       err = fscrypt_prepare_setattr(dentry, attr);
+       if (err)
+               return err;
 
        if ((attr->ia_valid & ATTR_SIZE) && attr->ia_size < inode->i_size)
                /* Truncation to a smaller size */