Merge tag 'fscrypt_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...

[linux-2.6-block.git] / fs / ubifs / file.c

diff --git a/fs/ubifs/file.c b/fs/ubifs/file.c
index 3cfc578c42eade80cef2e3669808e61f153325c3..cf348ba9923858927d6f19a92b65985184285dc3 100644 (file)
--- a/fs/ubifs/file.c
+++ b/fs/ubifs/file.c
@@ -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 */
@@ -1629,35 +1625,6 @@ static int ubifs_file_mmap(struct file *file, struct vm_area_struct *vma)
        return 0;
 }
 
-static int ubifs_file_open(struct inode *inode, struct file *filp)
-{
-       int ret;
-       struct dentry *dir;
-       struct ubifs_info *c = inode->i_sb->s_fs_info;
-
-       if (ubifs_crypt_is_encrypted(inode)) {
-               ret = fscrypt_get_encryption_info(inode);
-               if (ret)
-                       return -EACCES;
-               if (!fscrypt_has_encryption_key(inode))
-                       return -ENOKEY;
-       }
-
-       dir = dget_parent(file_dentry(filp));
-       if (ubifs_crypt_is_encrypted(d_inode(dir)) &&
-                       !fscrypt_has_permitted_context(d_inode(dir), inode)) {
-               ubifs_err(c, "Inconsistent encryption contexts: %lu/%lu",
-                         (unsigned long) d_inode(dir)->i_ino,
-                         (unsigned long) inode->i_ino);
-               dput(dir);
-               ubifs_ro_mode(c, -EPERM);
-               return -EPERM;
-       }
-       dput(dir);
-
-       return 0;
-}
-
 static const char *ubifs_get_link(struct dentry *dentry,
                                            struct inode *inode,
                                            struct delayed_call *done)
@@ -1714,7 +1681,7 @@ const struct file_operations ubifs_file_operations = {
        .unlocked_ioctl = ubifs_ioctl,
        .splice_read    = generic_file_splice_read,
        .splice_write   = iter_file_splice_write,
-       .open           = ubifs_file_open,
+       .open           = fscrypt_file_open,
 #ifdef CONFIG_COMPAT
        .compat_ioctl   = ubifs_compat_ioctl,
 #endif