diff options
Diffstat (limited to 'mm/swapfile.c')
| -rw-r--r-- | mm/swapfile.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/mm/swapfile.c b/mm/swapfile.c index ed5151079f59..1894dead0b58 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c | |||
| @@ -139,8 +139,7 @@ static int discard_swap(struct swap_info_struct *si) | |||
| 139 | nr_blocks = ((sector_t)se->nr_pages - 1) << (PAGE_SHIFT - 9); | 139 | nr_blocks = ((sector_t)se->nr_pages - 1) << (PAGE_SHIFT - 9); |
| 140 | if (nr_blocks) { | 140 | if (nr_blocks) { |
| 141 | err = blkdev_issue_discard(si->bdev, start_block, | 141 | err = blkdev_issue_discard(si->bdev, start_block, |
| 142 | nr_blocks, GFP_KERNEL, | 142 | nr_blocks, GFP_KERNEL, BLKDEV_IFL_WAIT); |
| 143 | BLKDEV_IFL_WAIT | BLKDEV_IFL_BARRIER); | ||
| 144 | if (err) | 143 | if (err) |
| 145 | return err; | 144 | return err; |
| 146 | cond_resched(); | 145 | cond_resched(); |
| @@ -151,8 +150,7 @@ static int discard_swap(struct swap_info_struct *si) | |||
| 151 | nr_blocks = (sector_t)se->nr_pages << (PAGE_SHIFT - 9); | 150 | nr_blocks = (sector_t)se->nr_pages << (PAGE_SHIFT - 9); |
| 152 | 151 | ||
| 153 | err = blkdev_issue_discard(si->bdev, start_block, | 152 | err = blkdev_issue_discard(si->bdev, start_block, |
| 154 | nr_blocks, GFP_KERNEL, | 153 | nr_blocks, GFP_KERNEL, BLKDEV_IFL_WAIT); |
| 155 | BLKDEV_IFL_WAIT | BLKDEV_IFL_BARRIER); | ||
| 156 | if (err) | 154 | if (err) |
| 157 | break; | 155 | break; |
| 158 | 156 | ||
| @@ -191,8 +189,7 @@ static void discard_swap_cluster(struct swap_info_struct *si, | |||
| 191 | start_block <<= PAGE_SHIFT - 9; | 189 | start_block <<= PAGE_SHIFT - 9; |
| 192 | nr_blocks <<= PAGE_SHIFT - 9; | 190 | nr_blocks <<= PAGE_SHIFT - 9; |
| 193 | if (blkdev_issue_discard(si->bdev, start_block, | 191 | if (blkdev_issue_discard(si->bdev, start_block, |
| 194 | nr_blocks, GFP_NOIO, BLKDEV_IFL_WAIT | | 192 | nr_blocks, GFP_NOIO, BLKDEV_IFL_WAIT)) |
| 195 | BLKDEV_IFL_BARRIER)) | ||
| 196 | break; | 193 | break; |
| 197 | } | 194 | } |
| 198 | 195 | ||