From 9e44c012d7e645f44a0723eb83d7b4f0661387cf Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Wed, 18 Aug 2010 05:29:20 -0400 Subject: [PATCH] --- yaml --- r: 213209 b: refs/heads/master c: 349f429eec36cb743fee20f4c193ecde97a3ed2e h: refs/heads/master i: 213207: 404fdcbaf5ee953be88a111b62194c641c41f0b7 v: v3 --- [refs] | 2 +- trunk/mm/swapfile.c | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 10d07bbaea03..201e094b1278 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e045db80d07250312500b2ed707b84dc703189d6 +refs/heads/master: 349f429eec36cb743fee20f4c193ecde97a3ed2e diff --git a/trunk/mm/swapfile.c b/trunk/mm/swapfile.c index 1f3f9c59a73a..68cda164dff6 100644 --- a/trunk/mm/swapfile.c +++ b/trunk/mm/swapfile.c @@ -141,8 +141,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(); @@ -153,8 +152,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; @@ -193,8 +191,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; }