aboutsummaryrefslogtreecommitdiffstats
path: root/fs/gfs2/rgrp.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/gfs2/rgrp.c')
-rw-r--r--fs/gfs2/rgrp.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c
index 171a744f8e4..37931647291 100644
--- a/fs/gfs2/rgrp.c
+++ b/fs/gfs2/rgrp.c
@@ -854,8 +854,7 @@ static void gfs2_rgrp_send_discards(struct gfs2_sbd *sdp, u64 offset,
854 if ((start + nr_sects) != blk) { 854 if ((start + nr_sects) != blk) {
855 rv = blkdev_issue_discard(bdev, start, 855 rv = blkdev_issue_discard(bdev, start,
856 nr_sects, GFP_NOFS, 856 nr_sects, GFP_NOFS,
857 BLKDEV_IFL_WAIT | 857 BLKDEV_IFL_WAIT);
858 BLKDEV_IFL_BARRIER);
859 if (rv) 858 if (rv)
860 goto fail; 859 goto fail;
861 nr_sects = 0; 860 nr_sects = 0;
@@ -870,7 +869,7 @@ start_new_extent:
870 } 869 }
871 if (nr_sects) { 870 if (nr_sects) {
872 rv = blkdev_issue_discard(bdev, start, nr_sects, GFP_NOFS, 871 rv = blkdev_issue_discard(bdev, start, nr_sects, GFP_NOFS,
873 BLKDEV_IFL_WAIT | BLKDEV_IFL_BARRIER); 872 BLKDEV_IFL_WAIT);
874 if (rv) 873 if (rv)
875 goto fail; 874 goto fail;
876 } 875 }