diff options
Diffstat (limited to 'fs/gfs2/rgrp.c')
| -rw-r--r-- | fs/gfs2/rgrp.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c index fb67f593f408..bef3ab6cf5c1 100644 --- a/fs/gfs2/rgrp.c +++ b/fs/gfs2/rgrp.c | |||
| @@ -866,8 +866,7 @@ static void gfs2_rgrp_send_discards(struct gfs2_sbd *sdp, u64 offset, | |||
| 866 | if ((start + nr_sects) != blk) { | 866 | if ((start + nr_sects) != blk) { |
| 867 | rv = blkdev_issue_discard(bdev, start, | 867 | rv = blkdev_issue_discard(bdev, start, |
| 868 | nr_sects, GFP_NOFS, | 868 | nr_sects, GFP_NOFS, |
| 869 | BLKDEV_IFL_WAIT | | 869 | 0); |
| 870 | BLKDEV_IFL_BARRIER); | ||
| 871 | if (rv) | 870 | if (rv) |
| 872 | goto fail; | 871 | goto fail; |
| 873 | nr_sects = 0; | 872 | nr_sects = 0; |
| @@ -881,8 +880,7 @@ start_new_extent: | |||
| 881 | } | 880 | } |
| 882 | } | 881 | } |
| 883 | if (nr_sects) { | 882 | if (nr_sects) { |
| 884 | rv = blkdev_issue_discard(bdev, start, nr_sects, GFP_NOFS, | 883 | rv = blkdev_issue_discard(bdev, start, nr_sects, GFP_NOFS, 0); |
| 885 | BLKDEV_IFL_WAIT | BLKDEV_IFL_BARRIER); | ||
| 886 | if (rv) | 884 | if (rv) |
| 887 | goto fail; | 885 | goto fail; |
| 888 | } | 886 | } |