Merge branch 'for-2.6.37/barrier' of git://git.kernel.dk/linux-2.6-block

[platform/adaptation/renesas_rcar/renesas_kernel.git] / fs / gfs2 / rgrp.c

diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c
index fb67f59..bef3ab6 100644 (file)
--- 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,
                                if ((start + nr_sects) != blk) {
                                        rv = blkdev_issue_discard(bdev, start,
                                                            nr_sects, GFP_NOFS,
-                                                           BLKDEV_IFL_WAIT |
-                                                           BLKDEV_IFL_BARRIER);
+                                                           0);
                                        if (rv)
                                                goto fail;
                                        nr_sects = 0;
@@ -881,8 +880,7 @@ start_new_extent:
                }
        }
        if (nr_sects) {
-               rv = blkdev_issue_discard(bdev, start, nr_sects, GFP_NOFS,
-                                        BLKDEV_IFL_WAIT | BLKDEV_IFL_BARRIER);
+               rv = blkdev_issue_discard(bdev, start, nr_sects, GFP_NOFS, 0);
                if (rv)
                        goto fail;
        }