IB/mlx4: Avoid accessing netdevice when building RoCE qp1 header

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

diff --git a/fs/xfs/xfs_dquot.c b/fs/xfs/xfs_dquot.c
index 3ee0cd4..63c2de4 100644 (file)
--- a/fs/xfs/xfs_dquot.c
+++ b/fs/xfs/xfs_dquot.c
@@ -327,7 +327,7 @@ xfs_qm_dqalloc(
         */
        if (!xfs_this_quota_on(dqp->q_mount, dqp->dq_flags)) {
                xfs_iunlock(quotip, XFS_ILOCK_EXCL);
-               return (ESRCH);
+               return -ESRCH;
        }
 
        xfs_trans_ijoin(tp, quotip, XFS_ILOCK_EXCL);
@@ -354,7 +354,7 @@ xfs_qm_dqalloc(
                               mp->m_quotainfo->qi_dqchunklen,
                               0);
        if (!bp) {
-               error = ENOMEM;
+               error = -ENOMEM;
                goto error1;
        }
        bp->b_ops = &xfs_dquot_buf_ops;
@@ -400,7 +400,7 @@ xfs_qm_dqalloc(
       error0:
        xfs_iunlock(quotip, XFS_ILOCK_EXCL);
 
-       return (error);
+       return error;
 }
 
 STATIC int
@@ -426,7 +426,7 @@ xfs_qm_dqrepair(
 
        if (error) {
                ASSERT(*bpp == NULL);
-               return XFS_ERROR(error);
+               return error;
        }
        (*bpp)->b_ops = &xfs_dquot_buf_ops;
 
@@ -442,7 +442,7 @@ xfs_qm_dqrepair(
                if (error) {
                        /* repair failed, we're screwed */
                        xfs_trans_brelse(tp, *bpp);
-                       return XFS_ERROR(EIO);
+                       return -EIO;
                }
        }
 
@@ -480,7 +480,7 @@ xfs_qm_dqtobp(
                 * didn't have the quota inode lock.
                 */
                xfs_iunlock(quotip, lock_mode);
-               return ESRCH;
+               return -ESRCH;
        }
 
        /*
@@ -508,7 +508,7 @@ xfs_qm_dqtobp(
                 * We don't allocate unless we're asked to
                 */
                if (!(flags & XFS_QMOPT_DQALLOC))
-                       return ENOENT;
+                       return -ENOENT;
 
                ASSERT(tp);
                error = xfs_qm_dqalloc(tpp, mp, dqp, quotip,
@@ -530,7 +530,7 @@ xfs_qm_dqtobp(
                                           mp->m_quotainfo->qi_dqchunklen,
                                           0, &bp, &xfs_dquot_buf_ops);
 
-               if (error == EFSCORRUPTED && (flags & XFS_QMOPT_DQREPAIR)) {
+               if (error == -EFSCORRUPTED && (flags & XFS_QMOPT_DQREPAIR)) {
                        xfs_dqid_t firstid = (xfs_dqid_t)map.br_startoff *
                                                mp->m_quotainfo->qi_dqperchunk;
                        ASSERT(bp == NULL);
@@ -539,7 +539,7 @@ xfs_qm_dqtobp(
 
                if (error) {
                        ASSERT(bp == NULL);
-                       return XFS_ERROR(error);
+                       return error;
                }
        }
 
@@ -547,7 +547,7 @@ xfs_qm_dqtobp(
        *O_bpp = bp;
        *O_ddpp = bp->b_addr + dqp->q_bufoffset;
 
-       return (0);
+       return 0;
 }
 
 
@@ -715,7 +715,7 @@ xfs_qm_dqget(
        if ((! XFS_IS_UQUOTA_ON(mp) && type == XFS_DQ_USER) ||
            (! XFS_IS_PQUOTA_ON(mp) && type == XFS_DQ_PROJ) ||
            (! XFS_IS_GQUOTA_ON(mp) && type == XFS_DQ_GROUP)) {
-               return (ESRCH);
+               return -ESRCH;
        }
 
 #ifdef DEBUG
@@ -723,7 +723,7 @@ xfs_qm_dqget(
                if ((xfs_dqerror_target == mp->m_ddev_targp) &&
                    (xfs_dqreq_num++ % xfs_dqerror_mod) == 0) {
                        xfs_debug(mp, "Returning error in dqget");
-                       return (EIO);
+                       return -EIO;
                }
        }
 
@@ -796,14 +796,14 @@ restart:
                } else {
                        /* inode stays locked on return */
                        xfs_qm_dqdestroy(dqp);
-                       return XFS_ERROR(ESRCH);
+                       return -ESRCH;
                }
        }
 
        mutex_lock(&qi->qi_tree_lock);
-       error = -radix_tree_insert(tree, id, dqp);
+       error = radix_tree_insert(tree, id, dqp);
        if (unlikely(error)) {
-               WARN_ON(error != EEXIST);
+               WARN_ON(error != -EEXIST);
 
                /*
                 * Duplicate found. Just throw away the new dquot and start
@@ -829,7 +829,7 @@ restart:
        ASSERT((ip == NULL) || xfs_isilocked(ip, XFS_ILOCK_EXCL));
        trace_xfs_dqget_miss(dqp);
        *O_dqpp = dqp;
-       return (0);
+       return 0;
 }
 
 /*
@@ -966,7 +966,7 @@ xfs_qm_dqflush(
                                             SHUTDOWN_CORRUPT_INCORE);
                else
                        spin_unlock(&mp->m_ail->xa_lock);
-               error = XFS_ERROR(EIO);
+               error = -EIO;
                goto out_unlock;
        }
 
@@ -974,7 +974,8 @@ xfs_qm_dqflush(
         * Get the buffer containing the on-disk dquot
         */
        error = xfs_trans_read_buf(mp, NULL, mp->m_ddev_targp, dqp->q_blkno,
-                                  mp->m_quotainfo->qi_dqchunklen, 0, &bp, NULL);
+                                  mp->m_quotainfo->qi_dqchunklen, 0, &bp,
+                                  &xfs_dquot_buf_ops);
        if (error)
                goto out_unlock;
 
@@ -992,7 +993,7 @@ xfs_qm_dqflush(
                xfs_buf_relse(bp);
                xfs_dqfunlock(dqp);
                xfs_force_shutdown(mp, SHUTDOWN_CORRUPT_INCORE);
-               return XFS_ERROR(EIO);
+               return -EIO;
        }
 
        /* This is the only portion of data that needs to persist */
@@ -1045,7 +1046,7 @@ xfs_qm_dqflush(
 
 out_unlock:
        xfs_dqfunlock(dqp);
-       return XFS_ERROR(EIO);
+       return -EIO;
 }
 
 /*