Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[cascardo/linux.git] / fs / xfs / xfs_quotaops.c

diff --git a/fs/xfs/xfs_quotaops.c b/fs/xfs/xfs_quotaops.c
index 2ad1b98..b238027 100644 (file)
--- a/fs/xfs/xfs_quotaops.c
+++ b/fs/xfs/xfs_quotaops.c
@@ -51,7 +51,7 @@ xfs_fs_get_xstate(
 
        if (!XFS_IS_QUOTA_RUNNING(mp))
                return -ENOSYS;
-       return -xfs_qm_scall_getqstat(mp, fqs);
+       return xfs_qm_scall_getqstat(mp, fqs);
 }
 
 STATIC int
@@ -63,7 +63,7 @@ xfs_fs_get_xstatev(
 
        if (!XFS_IS_QUOTA_RUNNING(mp))
                return -ENOSYS;
-       return -xfs_qm_scall_getqstatv(mp, fqs);
+       return xfs_qm_scall_getqstatv(mp, fqs);
 }
 
 STATIC int
@@ -95,11 +95,11 @@ xfs_fs_set_xstate(
 
        switch (op) {
        case Q_XQUOTAON:
-               return -xfs_qm_scall_quotaon(mp, flags);
+               return xfs_qm_scall_quotaon(mp, flags);
        case Q_XQUOTAOFF:
                if (!XFS_IS_QUOTA_ON(mp))
                        return -EINVAL;
-               return -xfs_qm_scall_quotaoff(mp, flags);
+               return xfs_qm_scall_quotaoff(mp, flags);
        }
 
        return -EINVAL;
@@ -112,7 +112,7 @@ xfs_fs_rm_xquota(
 {
        struct xfs_mount        *mp = XFS_M(sb);
        unsigned int            flags = 0;
-       
+
        if (sb->s_flags & MS_RDONLY)
                return -EROFS;
 
@@ -123,11 +123,11 @@ xfs_fs_rm_xquota(
                flags |= XFS_DQ_USER;
        if (uflags & FS_GROUP_QUOTA)
                flags |= XFS_DQ_GROUP;
-       if (uflags & FS_USER_QUOTA)
+       if (uflags & FS_PROJ_QUOTA)
                flags |= XFS_DQ_PROJ;
 
-       return -xfs_qm_scall_trunc_qfiles(mp, flags);
-}      
+       return xfs_qm_scall_trunc_qfiles(mp, flags);
+}
 
 STATIC int
 xfs_fs_get_dqblk(
@@ -142,7 +142,7 @@ xfs_fs_get_dqblk(
        if (!XFS_IS_QUOTA_ON(mp))
                return -ESRCH;
 
-       return -xfs_qm_scall_getquota(mp, from_kqid(&init_user_ns, qid),
+       return xfs_qm_scall_getquota(mp, from_kqid(&init_user_ns, qid),
                                      xfs_quota_type(qid.type), fdq);
 }
 
@@ -161,7 +161,7 @@ xfs_fs_set_dqblk(
        if (!XFS_IS_QUOTA_ON(mp))
                return -ESRCH;
 
-       return -xfs_qm_scall_setqlim(mp, from_kqid(&init_user_ns, qid),
+       return xfs_qm_scall_setqlim(mp, from_kqid(&init_user_ns, qid),
                                     xfs_quota_type(qid.type), fdq);
 }