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

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

diff --git a/fs/xfs/xfs_discard.c b/fs/xfs/xfs_discard.c
index 4f11ef0..13d08a1 100644 (file)
--- a/fs/xfs/xfs_discard.c
+++ b/fs/xfs/xfs_discard.c
@@ -124,7 +124,7 @@ xfs_trim_extents(
                }
 
                trace_xfs_discard_extent(mp, agno, fbno, flen);
-               error = -blkdev_issue_discard(bdev, dbno, dlen, GFP_NOFS, 0);
+               error = blkdev_issue_discard(bdev, dbno, dlen, GFP_NOFS, 0);
                if (error)
                        goto out_del_cursor;
                *blocks_trimmed += flen;
@@ -166,11 +166,11 @@ xfs_ioc_trim(
        int                     error, last_error = 0;
 
        if (!capable(CAP_SYS_ADMIN))
-               return -XFS_ERROR(EPERM);
+               return -EPERM;
        if (!blk_queue_discard(q))
-               return -XFS_ERROR(EOPNOTSUPP);
+               return -EOPNOTSUPP;
        if (copy_from_user(&range, urange, sizeof(range)))
-               return -XFS_ERROR(EFAULT);
+               return -EFAULT;
 
        /*
         * Truncating down the len isn't actually quite correct, but using
@@ -182,7 +182,7 @@ xfs_ioc_trim(
        if (range.start >= XFS_FSB_TO_B(mp, mp->m_sb.sb_dblocks) ||
            range.minlen > XFS_FSB_TO_B(mp, XFS_ALLOC_AG_MAX_USABLE(mp)) ||
            range.len < mp->m_sb.sb_blocksize)
-               return -XFS_ERROR(EINVAL);
+               return -EINVAL;
 
        start = BTOBB(range.start);
        end = start + BTOBBT(range.len) - 1;
@@ -195,7 +195,7 @@ xfs_ioc_trim(
        end_agno = xfs_daddr_to_agno(mp, end);
 
        for (agno = start_agno; agno <= end_agno; agno++) {
-               error = -xfs_trim_extents(mp, agno, start, end, minlen,
+               error = xfs_trim_extents(mp, agno, start, end, minlen,
                                          &blocks_trimmed);
                if (error)
                        last_error = error;
@@ -206,7 +206,7 @@ xfs_ioc_trim(
 
        range.len = XFS_FSB_TO_B(mp, blocks_trimmed);
        if (copy_to_user(urange, &range, sizeof(range)))
-               return -XFS_ERROR(EFAULT);
+               return -EFAULT;
        return 0;
 }
 
@@ -222,11 +222,11 @@ xfs_discard_extents(
                trace_xfs_discard_extent(mp, busyp->agno, busyp->bno,
                                         busyp->length);
 
-               error = -blkdev_issue_discard(mp->m_ddev_targp->bt_bdev,
+               error = blkdev_issue_discard(mp->m_ddev_targp->bt_bdev,
                                XFS_AGB_TO_DADDR(mp, busyp->agno, busyp->bno),
                                XFS_FSB_TO_BB(mp, busyp->length),
                                GFP_NOFS, 0);
-               if (error && error != EOPNOTSUPP) {
+               if (error && error != -EOPNOTSUPP) {
                        xfs_info(mp,
         "discard failed for extent [0x%llu,%u], error %d",
                                 (unsigned long long)busyp->bno,