Merge tag 'mfd-fixes-3.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo...

[firefly-linux-kernel-4.4.55.git] / fs / udf / file.c

diff --git a/fs/udf/file.c b/fs/udf/file.c
index 77b5953eaac87f708ed0ff6889eff5775dd3b465..29569dd0816814f23a34d713a3f3178c4e822929 100644 (file)
--- a/fs/udf/file.c
+++ b/fs/udf/file.c
@@ -139,7 +139,7 @@ static ssize_t udf_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
 {
        ssize_t retval;
        struct file *file = iocb->ki_filp;
-       struct inode *inode = file->f_path.dentry->d_inode;
+       struct inode *inode = file_inode(file);
        int err, pos;
        size_t count = iocb->ki_left;
        struct udf_inode_info *iinfo = UDF_I(inode);
@@ -178,7 +178,7 @@ static ssize_t udf_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
 
 long udf_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
 {
-       struct inode *inode = filp->f_dentry->d_inode;
+       struct inode *inode = file_inode(filp);
        long old_block, new_block;
        int result = -EINVAL;
 
@@ -204,7 +204,7 @@ long udf_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
                goto out;
        case UDF_RELOCATE_BLOCKS:
                if (!capable(CAP_SYS_ADMIN)) {
-                       result = -EACCES;
+                       result = -EPERM;
                        goto out;
                }
                if (get_user(old_block, (long __user *)arg)) {