diff options
Diffstat (limited to 'fs/xfs/xfs_discard.c')
-rw-r--r-- | fs/xfs/xfs_discard.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/xfs/xfs_discard.c b/fs/xfs/xfs_discard.c index 3fee16e63f3a..13d08a1b390e 100644 --- a/fs/xfs/xfs_discard.c +++ b/fs/xfs/xfs_discard.c | |||
@@ -124,7 +124,7 @@ xfs_trim_extents( | |||
124 | } | 124 | } |
125 | 125 | ||
126 | trace_xfs_discard_extent(mp, agno, fbno, flen); | 126 | trace_xfs_discard_extent(mp, agno, fbno, flen); |
127 | error = -blkdev_issue_discard(bdev, dbno, dlen, GFP_NOFS, 0); | 127 | error = blkdev_issue_discard(bdev, dbno, dlen, GFP_NOFS, 0); |
128 | if (error) | 128 | if (error) |
129 | goto out_del_cursor; | 129 | goto out_del_cursor; |
130 | *blocks_trimmed += flen; | 130 | *blocks_trimmed += flen; |
@@ -195,7 +195,7 @@ xfs_ioc_trim( | |||
195 | end_agno = xfs_daddr_to_agno(mp, end); | 195 | end_agno = xfs_daddr_to_agno(mp, end); |
196 | 196 | ||
197 | for (agno = start_agno; agno <= end_agno; agno++) { | 197 | for (agno = start_agno; agno <= end_agno; agno++) { |
198 | error = -xfs_trim_extents(mp, agno, start, end, minlen, | 198 | error = xfs_trim_extents(mp, agno, start, end, minlen, |
199 | &blocks_trimmed); | 199 | &blocks_trimmed); |
200 | if (error) | 200 | if (error) |
201 | last_error = error; | 201 | last_error = error; |
@@ -222,11 +222,11 @@ xfs_discard_extents( | |||
222 | trace_xfs_discard_extent(mp, busyp->agno, busyp->bno, | 222 | trace_xfs_discard_extent(mp, busyp->agno, busyp->bno, |
223 | busyp->length); | 223 | busyp->length); |
224 | 224 | ||
225 | error = -blkdev_issue_discard(mp->m_ddev_targp->bt_bdev, | 225 | error = blkdev_issue_discard(mp->m_ddev_targp->bt_bdev, |
226 | XFS_AGB_TO_DADDR(mp, busyp->agno, busyp->bno), | 226 | XFS_AGB_TO_DADDR(mp, busyp->agno, busyp->bno), |
227 | XFS_FSB_TO_BB(mp, busyp->length), | 227 | XFS_FSB_TO_BB(mp, busyp->length), |
228 | GFP_NOFS, 0); | 228 | GFP_NOFS, 0); |
229 | if (error && error != EOPNOTSUPP) { | 229 | if (error && error != -EOPNOTSUPP) { |
230 | xfs_info(mp, | 230 | xfs_info(mp, |
231 | "discard failed for extent [0x%llu,%u], error %d", | 231 | "discard failed for extent [0x%llu,%u], error %d", |
232 | (unsigned long long)busyp->bno, | 232 | (unsigned long long)busyp->bno, |