|
@@ -139,8 +139,7 @@ static int discard_swap(struct swap_info_struct *si)
|
|
|
nr_blocks = ((sector_t)se->nr_pages - 1) << (PAGE_SHIFT - 9);
|
|
|
if (nr_blocks) {
|
|
|
err = blkdev_issue_discard(si->bdev, start_block,
|
|
|
- nr_blocks, GFP_KERNEL,
|
|
|
- BLKDEV_IFL_WAIT | BLKDEV_IFL_BARRIER);
|
|
|
+ nr_blocks, GFP_KERNEL, BLKDEV_IFL_WAIT);
|
|
|
if (err)
|
|
|
return err;
|
|
|
cond_resched();
|
|
@@ -151,8 +150,7 @@ static int discard_swap(struct swap_info_struct *si)
|
|
|
nr_blocks = (sector_t)se->nr_pages << (PAGE_SHIFT - 9);
|
|
|
|
|
|
err = blkdev_issue_discard(si->bdev, start_block,
|
|
|
- nr_blocks, GFP_KERNEL,
|
|
|
- BLKDEV_IFL_WAIT | BLKDEV_IFL_BARRIER);
|
|
|
+ nr_blocks, GFP_KERNEL, BLKDEV_IFL_WAIT);
|
|
|
if (err)
|
|
|
break;
|
|
|
|
|
@@ -191,8 +189,7 @@ static void discard_swap_cluster(struct swap_info_struct *si,
|
|
|
start_block <<= PAGE_SHIFT - 9;
|
|
|
nr_blocks <<= PAGE_SHIFT - 9;
|
|
|
if (blkdev_issue_discard(si->bdev, start_block,
|
|
|
- nr_blocks, GFP_NOIO, BLKDEV_IFL_WAIT |
|
|
|
- BLKDEV_IFL_BARRIER))
|
|
|
+ nr_blocks, GFP_NOIO, BLKDEV_IFL_WAIT))
|
|
|
break;
|
|
|
}
|
|
|
|