1 files changed, 67 insertions, 73 deletions
diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
index 1a1648fbda1c..30983b8ceaa1 100644
--- a/fs/xfs/xfs_ioctl.c
+++ b/fs/xfs/xfs_ioctl.c
@@ -305,7 +305,7 @@ xfs_readlink_by_handle(
                goto out_dput;
        }
-        error = -xfs_readlink(XFS_I(dentry->d_inode), link);
+        error = xfs_readlink(XFS_I(dentry->d_inode), link);
        if (error)
                goto out_kfree;
        error = readlink_copy(hreq->ohandle, olen, link);
@@ -330,10 +330,10 @@ xfs_set_dmattrs(
        int             error;
        if (!capable(CAP_SYS_ADMIN))
-                return EPERM;
+                return -EPERM;
        if (XFS_FORCED_SHUTDOWN(mp))
-                return EIO;
+                return -EIO;
        tp = xfs_trans_alloc(mp, XFS_TRANS_SET_DMATTRS);
        error = xfs_trans_reserve(tp, &M_RES(mp)->tr_ichange, 0, 0);
@@ -388,7 +388,7 @@ xfs_fssetdm_by_handle(
                goto out;
        }
-        error = -xfs_set_dmattrs(XFS_I(dentry->d_inode), fsd.fsd_dmevmask,
+        error = xfs_set_dmattrs(XFS_I(dentry->d_inode), fsd.fsd_dmevmask,
                                 fsd.fsd_dmstate);
 out:
@@ -431,7 +431,7 @@ xfs_attrlist_by_handle(
                goto out_dput;
        cursor = (attrlist_cursor_kern_t *)&al_hreq.pos;
-        error = -xfs_attr_list(XFS_I(dentry->d_inode), kbuf, al_hreq.buflen,
+        error = xfs_attr_list(XFS_I(dentry->d_inode), kbuf, al_hreq.buflen,
                                        al_hreq.flags, cursor);
        if (error)
                goto out_kfree;
@@ -455,20 +455,20 @@ xfs_attrmulti_attr_get(
        __uint32_t              flags)
 {
        unsigned char           *kbuf;
-        int                     error = EFAULT;
+        int                     error = -EFAULT;
        if (*len > XATTR_SIZE_MAX)
-                return EINVAL;
+                return -EINVAL;
        kbuf = kmem_zalloc_large(*len, KM_SLEEP);
        if (!kbuf)
-                return ENOMEM;
+                return -ENOMEM;
        error = xfs_attr_get(XFS_I(inode), name, kbuf, (int *)len, flags);
        if (error)
                goto out_kfree;
        if (copy_to_user(ubuf, kbuf, *len))
-                error = EFAULT;
+                error = -EFAULT;
 out_kfree:
        kmem_free(kbuf);
@@ -484,20 +484,17 @@ xfs_attrmulti_attr_set(
        __uint32_t              flags)
 {
        unsigned char           *kbuf;
-        int                     error = EFAULT;
        if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
-                return EPERM;
+                return -EPERM;
        if (len > XATTR_SIZE_MAX)
-                return EINVAL;
+                return -EINVAL;
        kbuf = memdup_user(ubuf, len);
        if (IS_ERR(kbuf))
                return PTR_ERR(kbuf);
-        error = xfs_attr_set(XFS_I(inode), name, kbuf, len, flags);
+        return xfs_attr_set(XFS_I(inode), name, kbuf, len, flags);
-        return error;
 }
 int
@@ -507,7 +504,7 @@ xfs_attrmulti_attr_remove(
        __uint32_t              flags)
 {
        if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
-                return EPERM;
+                return -EPERM;
        return xfs_attr_remove(XFS_I(inode), name, flags);
 }
@@ -536,18 +533,18 @@ xfs_attrmulti_by_handle(
        if (IS_ERR(dentry))
                return PTR_ERR(dentry);
-        error = E2BIG;
+        error = -E2BIG;
        size = am_hreq.opcount * sizeof(xfs_attr_multiop_t);
        if (!size || size > 16 * PAGE_SIZE)
                goto out_dput;
        ops = memdup_user(am_hreq.ops, size);
        if (IS_ERR(ops)) {
-                error = -PTR_ERR(ops);
+                error = PTR_ERR(ops);
                goto out_dput;
        }
-        error = ENOMEM;
+        error = -ENOMEM;
        attr_name = kmalloc(MAXNAMELEN, GFP_KERNEL);
        if (!attr_name)
                goto out_kfree_ops;
@@ -557,7 +554,7 @@ xfs_attrmulti_by_handle(
                ops[i].am_error = strncpy_from_user((char *)attr_name,
                                ops[i].am_attrname, MAXNAMELEN);
                if (ops[i].am_error == 0 || ops[i].am_error == MAXNAMELEN)
-                        error = ERANGE;
+                        error = -ERANGE;
                if (ops[i].am_error < 0)
                        break;
@@ -588,19 +585,19 @@ xfs_attrmulti_by_handle(
                        mnt_drop_write_file(parfilp);
                        break;
                default:
-                        ops[i].am_error = EINVAL;
+                        ops[i].am_error = -EINVAL;
                }
        }
        if (copy_to_user(am_hreq.ops, ops, size))
-                error = EFAULT;
+                error = -EFAULT;
        kfree(attr_name);
 out_kfree_ops:
        kfree(ops);
 out_dput:
        dput(dentry);
-        return -error;
+        return error;
 }
 int
@@ -652,7 +649,7 @@ xfs_ioc_space(
                bf->l_start += XFS_ISIZE(ip);
                break;
        default:
-                error = EINVAL;
+                error = -EINVAL;
                goto out_unlock;
        }
@@ -669,7 +666,7 @@ xfs_ioc_space(
        case XFS_IOC_UNRESVSP:
        case XFS_IOC_UNRESVSP64:
                if (bf->l_len <= 0) {
-                        error = EINVAL;
+                        error = -EINVAL;
                        goto out_unlock;
                }
                break;
@@ -682,7 +679,7 @@ xfs_ioc_space(
            bf->l_start > mp->m_super->s_maxbytes ||
            bf->l_start + bf->l_len < 0 ||
            bf->l_start + bf->l_len >= mp->m_super->s_maxbytes) {
-                error = EINVAL;
+                error = -EINVAL;
                goto out_unlock;
        }
@@ -723,7 +720,7 @@ xfs_ioc_space(
                break;
        default:
                ASSERT(0);
-                error = EINVAL;
+                error = -EINVAL;
        }
        if (error)
@@ -759,7 +756,7 @@ xfs_ioc_space(
 out_unlock:
        xfs_iunlock(ip, XFS_IOLOCK_EXCL);
        mnt_drop_write_file(filp);
-        return -error;
+        return error;
 }
 STATIC int
@@ -807,7 +804,7 @@ xfs_ioc_bulkstat(
                                     &done);
        if (error)
-                return -error;
+                return error;
        if (bulkreq.ocount != NULL) {
                if (copy_to_user(bulkreq.lastip, &inlast,
@@ -831,7 +828,7 @@ xfs_ioc_fsgeometry_v1(
        error = xfs_fs_geometry(mp, &fsgeo, 3);
        if (error)
-                return -error;
+                return error;
        /*
         * Caller should have passed an argument of type
@@ -853,7 +850,7 @@ xfs_ioc_fsgeometry(
        error = xfs_fs_geometry(mp, &fsgeo, 4);
        if (error)
-                return -error;
+                return error;
        if (copy_to_user(arg, &fsgeo, sizeof(fsgeo)))
                return -EFAULT;
@@ -1041,16 +1038,16 @@ xfs_ioctl_setattr(
        trace_xfs_ioctl_setattr(ip);
        if (mp->m_flags & XFS_MOUNT_RDONLY)
-                return EROFS;
+                return -EROFS;
        if (XFS_FORCED_SHUTDOWN(mp))
-                return EIO;
+                return -EIO;
        /*
         * Disallow 32bit project ids when projid32bit feature is not enabled.
         */
        if ((mask & FSX_PROJID) && (fa->fsx_projid > (__uint16_t)-1) &&
                        !xfs_sb_version_hasprojid32bit(&ip->i_mount->m_sb))
-                return EINVAL;
+                return -EINVAL;
        /*
         * If disk quotas is on, we make sure that the dquots do exist on disk,
@@ -1088,7 +1085,7 @@ xfs_ioctl_setattr(
         * CAP_FSETID capability is applicable.
         */
        if (!inode_owner_or_capable(VFS_I(ip))) {
-                code = EPERM;
+                code = -EPERM;
                goto error_return;
        }
@@ -1099,7 +1096,7 @@ xfs_ioctl_setattr(
         */
        if (mask & FSX_PROJID) {
                if (current_user_ns() != &init_user_ns) {
-                        code = EINVAL;
+                        code = -EINVAL;
                        goto error_return;
                }
@@ -1122,7 +1119,7 @@ xfs_ioctl_setattr(
                if (ip->i_d.di_nextents &&
                    ((ip->i_d.di_extsize << mp->m_sb.sb_blocklog) !=
                     fa->fsx_extsize)) {
-                        code = EINVAL;  /* EFBIG? */
+                        code = -EINVAL; /* EFBIG? */
                        goto error_return;
                }
@@ -1141,7 +1138,7 @@ xfs_ioctl_setattr(
                        extsize_fsb = XFS_B_TO_FSB(mp, fa->fsx_extsize);
                        if (extsize_fsb > MAXEXTLEN) {
-                                code = EINVAL;
+                                code = -EINVAL;
                                goto error_return;
                        }
@@ -1153,13 +1150,13 @@ xfs_ioctl_setattr(
                        } else {
                                size = mp->m_sb.sb_blocksize;
                                if (extsize_fsb > mp->m_sb.sb_agblocks / 2) {
-                                        code = EINVAL;
+                                        code = -EINVAL;
                                        goto error_return;
                                }
                        }
                        if (fa->fsx_extsize % size) {
-                                code = EINVAL;
+                                code = -EINVAL;
                                goto error_return;
                        }
                }
@@ -1173,7 +1170,7 @@ xfs_ioctl_setattr(
                if ((ip->i_d.di_nextents || ip->i_delayed_blks) &&
                    (XFS_IS_REALTIME_INODE(ip)) !=
                    (fa->fsx_xflags & XFS_XFLAG_REALTIME)) {
-                        code = EINVAL;  /* EFBIG? */
+                        code = -EINVAL; /* EFBIG? */
                        goto error_return;
                }
@@ -1184,7 +1181,7 @@ xfs_ioctl_setattr(
                        if ((mp->m_sb.sb_rblocks == 0) ||
                            (mp->m_sb.sb_rextsize == 0) ||
                            (ip->i_d.di_extsize % mp->m_sb.sb_rextsize)) {
-                                code = EINVAL;
+                                code = -EINVAL;
                                goto error_return;
                        }
                }
@@ -1198,7 +1195,7 @@ xfs_ioctl_setattr(
                     (fa->fsx_xflags &
                                (XFS_XFLAG_IMMUTABLE | XFS_XFLAG_APPEND))) &&
                    !capable(CAP_LINUX_IMMUTABLE)) {
-                        code = EPERM;
+                        code = -EPERM;
                        goto error_return;
                }
        }
@@ -1301,7 +1298,7 @@ xfs_ioc_fssetxattr(
                return error;
        error = xfs_ioctl_setattr(ip, &fa, mask);
        mnt_drop_write_file(filp);
-        return -error;
+        return error;
 }
 STATIC int
@@ -1346,7 +1343,7 @@ xfs_ioc_setxflags(
                return error;
        error = xfs_ioctl_setattr(ip, &fa, mask);
        mnt_drop_write_file(filp);
-        return -error;
+        return error;
 }
 STATIC int
@@ -1356,7 +1353,7 @@ xfs_getbmap_format(void **ap, struct getbmapx *bmv, int *full)
        /* copy only getbmap portion (not getbmapx) */
        if (copy_to_user(base, bmv, sizeof(struct getbmap)))
-                return EFAULT;
+                return -EFAULT;
        *ap += sizeof(struct getbmap);
        return 0;
@@ -1385,7 +1382,7 @@ xfs_ioc_getbmap(
        error = xfs_getbmap(ip, &bmx, xfs_getbmap_format,
                            (struct getbmap *)arg+1);
        if (error)
-                return -error;
+                return error;
        /* copy back header - only size of getbmap */
        if (copy_to_user(arg, &bmx, sizeof(struct getbmap)))
@@ -1399,7 +1396,7 @@ xfs_getbmapx_format(void **ap, struct getbmapx *bmv, int *full)
        struct getbmapx __user  *base = *ap;
        if (copy_to_user(base, bmv, sizeof(struct getbmapx)))
-                return EFAULT;
+                return -EFAULT;
        *ap += sizeof(struct getbmapx);
        return 0;
@@ -1425,7 +1422,7 @@ xfs_ioc_getbmapx(
        error = xfs_getbmap(ip, &bmx, xfs_getbmapx_format,
                            (struct getbmapx *)arg+1);
        if (error)
-                return -error;
+                return error;
        /* copy back header */
        if (copy_to_user(arg, &bmx, sizeof(struct getbmapx)))
@@ -1445,33 +1442,33 @@ xfs_ioc_swapext(
        /* Pull information for the target fd */
        f = fdget((int)sxp->sx_fdtarget);
        if (!f.file) {
-                error = EINVAL;
+                error = -EINVAL;
                goto out;
        }
        if (!(f.file->f_mode & FMODE_WRITE) ||
            !(f.file->f_mode & FMODE_READ) ||
            (f.file->f_flags & O_APPEND)) {
-                error = EBADF;
+                error = -EBADF;
                goto out_put_file;
        }
        tmp = fdget((int)sxp->sx_fdtmp);
        if (!tmp.file) {
-                error = EINVAL;
+                error = -EINVAL;
                goto out_put_file;
        }
        if (!(tmp.file->f_mode & FMODE_WRITE) ||
            !(tmp.file->f_mode & FMODE_READ) ||
            (tmp.file->f_flags & O_APPEND)) {
-                error = EBADF;
+                error = -EBADF;
                goto out_put_tmp_file;
        }
        if (IS_SWAPFILE(file_inode(f.file)) ||
            IS_SWAPFILE(file_inode(tmp.file))) {
-                error = EINVAL;
+                error = -EINVAL;
                goto out_put_tmp_file;
        }
@@ -1479,17 +1476,17 @@ xfs_ioc_swapext(
        tip = XFS_I(file_inode(tmp.file));
        if (ip->i_mount != tip->i_mount) {
-                error = EINVAL;
+                error = -EINVAL;
                goto out_put_tmp_file;
        }
        if (ip->i_ino == tip->i_ino) {
-                error = EINVAL;
+                error = -EINVAL;
                goto out_put_tmp_file;
        }
        if (XFS_FORCED_SHUTDOWN(ip->i_mount)) {
-                error = EIO;
+                error = -EIO;
                goto out_put_tmp_file;
        }
@@ -1597,7 +1594,7 @@ xfs_file_ioctl(
                error = xfs_set_dmattrs(ip, dmi.fsd_dmevmask,
                                dmi.fsd_dmstate);
                mnt_drop_write_file(filp);
-                return -error;
+                return error;
        }
        case XFS_IOC_GETBMAP:
@@ -1649,7 +1646,7 @@ xfs_file_ioctl(
                        return error;
                error = xfs_ioc_swapext(&sxp);
                mnt_drop_write_file(filp);
-                return -error;
+                return error;
        }
        case XFS_IOC_FSCOUNTS: {
@@ -1657,7 +1654,7 @@ xfs_file_ioctl(
                error = xfs_fs_counts(mp, &out);
                if (error)
-                        return -error;
+                        return error;
                if (copy_to_user(arg, &out, sizeof(out)))
                        return -EFAULT;
@@ -1686,7 +1683,7 @@ xfs_file_ioctl(
                error = xfs_reserve_blocks(mp, &in, &inout);
                mnt_drop_write_file(filp);
                if (error)
-                        return -error;
+                        return error;
                if (copy_to_user(arg, &inout, sizeof(inout)))
                        return -EFAULT;
@@ -1701,7 +1698,7 @@ xfs_file_ioctl(
                error = xfs_reserve_blocks(mp, NULL, &out);
                if (error)
-                        return -error;
+                        return error;
                if (copy_to_user(arg, &out, sizeof(out)))
                        return -EFAULT;
@@ -1720,7 +1717,7 @@ xfs_file_ioctl(
                        return error;
                error = xfs_growfs_data(mp, &in);
                mnt_drop_write_file(filp);
-                return -error;
+                return error;
        }
        case XFS_IOC_FSGROWFSLOG: {
@@ -1734,7 +1731,7 @@ xfs_file_ioctl(
                        return error;
                error = xfs_growfs_log(mp, &in);
                mnt_drop_write_file(filp);
-                return -error;
+                return error;
        }
        case XFS_IOC_FSGROWFSRT: {
@@ -1748,7 +1745,7 @@ xfs_file_ioctl(
                        return error;
                error = xfs_growfs_rt(mp, &in);
                mnt_drop_write_file(filp);
-                return -error;
+                return error;
        }
        case XFS_IOC_GOINGDOWN: {
@@ -1760,8 +1757,7 @@ xfs_file_ioctl(
                if (get_user(in, (__uint32_t __user *)arg))
                        return -EFAULT;
-                error = xfs_fs_goingdown(mp, in);
+                return xfs_fs_goingdown(mp, in);
-                return -error;
        }
        case XFS_IOC_ERROR_INJECTION: {
@@ -1773,16 +1769,14 @@ xfs_file_ioctl(
                if (copy_from_user(&in, arg, sizeof(in)))
                        return -EFAULT;
-                error = xfs_errortag_add(in.errtag, mp);
+                return xfs_errortag_add(in.errtag, mp);
-                return -error;
        }
        case XFS_IOC_ERROR_CLEARALL:
                if (!capable(CAP_SYS_ADMIN))
                        return -EPERM;
-                error = xfs_errortag_clearall(mp, 1);
+                return xfs_errortag_clearall(mp, 1);
-                return -error;
        case XFS_IOC_FREE_EOFBLOCKS: {
                struct xfs_fs_eofblocks eofb;
@@ -1799,9 +1793,9 @@ xfs_file_ioctl(
                error = xfs_fs_eofblocks_from_user(&eofb, &keofb);
                if (error)
-                        return -error;
+                        return error;
-                return -xfs_icache_free_eofblocks(mp, &keofb);
+                return xfs_icache_free_eofblocks(mp, &keofb);
        }
        default: