All of lore.kernel.org
 help / color / mirror / Atom feed
From: Christoph Hellwig <hch@infradead.org>
To: tj@kernel.org
Cc: chris.mason@oracle.com, swhiteho@redhat.com,
	konishi.ryusuke@lab.ntt.co.jp, tytso@mit.edu, jack@suse.cz,
	hirofumi@mail.parknet.co.jp, mfasheh@suse.com,
	joel.becker@oracle.com, hughd@google.com,
	linux-fsdevel@vger.kernel.org
Subject: [PATCH 12/15] swap: do not send discards as barriers
Date: Wed, 18 Aug 2010 05:29:20 -0400	[thread overview]
Message-ID: <20100818093502.062639046@bombadil.infradead.org> (raw)
In-Reply-To: 20100818093432.646633424@bombadil.infradead.org

[-- Attachment #1: swap-discard-nobarrier --]
[-- Type: text/plain, Size: 1196 bytes --]

The swap code already uses synchronous discards, no need to add I/O barriers.

Signed-off-by: Christoph Hellwig <hch@lst.de>

Index: linux-2.6/mm/swapfile.c
===================================================================
--- linux-2.6.orig/mm/swapfile.c	2010-08-17 16:49:28.312010428 +0200
+++ linux-2.6/mm/swapfile.c	2010-08-17 16:49:43.694255853 +0200
@@ -140,7 +140,7 @@ static int discard_swap(struct swap_info
 	if (nr_blocks) {
 		err = blkdev_issue_discard(si->bdev, start_block,
 				nr_blocks, GFP_KERNEL,
-				BLKDEV_IFL_WAIT | BLKDEV_IFL_BARRIER);
+				BLKDEV_IFL_WAIT);
 		if (err)
 			return err;
 		cond_resched();
@@ -152,7 +152,7 @@ static int discard_swap(struct swap_info
 
 		err = blkdev_issue_discard(si->bdev, start_block,
 				nr_blocks, GFP_KERNEL,
-				BLKDEV_IFL_WAIT | BLKDEV_IFL_BARRIER);
+				BLKDEV_IFL_WAIT);
 		if (err)
 			break;
 
@@ -191,8 +191,7 @@ static void discard_swap_cluster(struct
 			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;
 		}
 


  parent reply	other threads:[~2010-08-18  9:35 UTC|newest]

Thread overview: 41+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-08-18  9:29 [PATCH 00/15] replace barriers with explicit flush / FUA usage Christoph Hellwig
2010-08-18  9:29 ` [PATCH 01/15] kill BH_Ordered flag Christoph Hellwig
2010-08-18  9:29 ` [PATCH 02/15] pass gfp_mask and flags to sb_issue_discard Christoph Hellwig
2010-08-20  1:23   ` Mike Snitzer
2010-08-18  9:29 ` [PATCH 03/15] xfs: replace barriers with explicit flush / FUA usage Christoph Hellwig
2010-08-18 23:47   ` Dave Chinner
2010-08-18  9:29 ` [PATCH 04/15] btrfs: " Christoph Hellwig
2010-08-18 12:06   ` Chris Mason
2010-08-18  9:29 ` [PATCH 05/15] gfs2: " Christoph Hellwig
2010-08-18 10:08   ` Steven Whitehouse
2010-08-18 13:37   ` Bob Peterson
2010-08-18  9:29 ` [PATCH 06/15] reiserfs: " Christoph Hellwig
2010-08-18 13:16   ` Jan Kara
2010-08-18 13:21     ` Chris Mason
2010-08-18  9:29 ` [PATCH 07/15] nilfs2: " Christoph Hellwig
2010-08-18 13:31   ` Ryusuke Konishi
2010-08-18 13:41     ` Christoph Hellwig
2010-08-18  9:29 ` [PATCH 08/15] jbd: " Christoph Hellwig
2010-08-18 13:07   ` Jan Kara
2010-08-18  9:29 ` [PATCH 09/15] jbd2: " Christoph Hellwig
2010-08-18 14:03   ` Jan Kara
2010-08-18 14:09     ` Christoph Hellwig
2010-08-18  9:29 ` [PATCH 10/15] ext4: do not send discards as barriers Christoph Hellwig
2010-08-18 13:28   ` Jan Kara
2010-08-18  9:29 ` [PATCH 11/15] fat: " Christoph Hellwig
2010-08-18  9:29 ` Christoph Hellwig [this message]
2010-08-19  3:47   ` [PATCH 12/15] swap: " Hugh Dickins
2010-08-19  4:08     ` Nigel Cunningham
2010-08-19  9:02     ` Christoph Hellwig
2010-08-19 11:35       ` Chris Mason
2010-08-22 12:20     ` Nigel Cunningham
2010-08-18  9:29 ` [PATCH 13/15] remove the WRITE_BARRIER flag Christoph Hellwig
2010-08-18  9:29 ` [PATCH 14/15] remove the BLKDEV_IFL_BARRIER flag Christoph Hellwig
2010-08-20  1:26   ` Mike Snitzer
2010-08-18  9:29 ` [PATCH 15/15] remove the BH_Eopnotsupp flag Christoph Hellwig
2010-08-18 10:35 ` [PATCH 00/15] replace barriers with explicit flush / FUA usage Joel Becker
2010-08-18 10:53   ` Christoph Hellwig
2010-08-20  6:50     ` Tao Ma
2010-08-18 15:11 ` Ted Ts'o
2010-08-18 16:46   ` Christoph Hellwig
2010-08-20  4:00 ` Tao Ma

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20100818093502.062639046@bombadil.infradead.org \
    --to=hch@infradead.org \
    --cc=chris.mason@oracle.com \
    --cc=hirofumi@mail.parknet.co.jp \
    --cc=hughd@google.com \
    --cc=jack@suse.cz \
    --cc=joel.becker@oracle.com \
    --cc=konishi.ryusuke@lab.ntt.co.jp \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=mfasheh@suse.com \
    --cc=swhiteho@redhat.com \
    --cc=tj@kernel.org \
    --cc=tytso@mit.edu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.