diff options
author | Christoph Hellwig <hch@infradead.org> | 2010-08-18 05:29:12 -0400 |
---|---|---|
committer | Jens Axboe <jaxboe@fusionio.com> | 2010-09-10 12:35:39 +0200 |
commit | c3b9a62c8f932f32a733d6b628f61f3f28345727 (patch) | |
tree | 623a150079db7883444cc404ffcc1e0af4b80b7a /fs/btrfs/extent-tree.c | |
parent | 80f6c29d8a758650d5c9eac05074b4b3e8c266df (diff) | |
download | op-kernel-dev-c3b9a62c8f932f32a733d6b628f61f3f28345727.zip op-kernel-dev-c3b9a62c8f932f32a733d6b628f61f3f28345727.tar.gz |
btrfs: replace barriers with explicit flush / FUA usage
Switch to the WRITE_FLUSH_FUA flag for log writes, remove the EOPNOTSUPP
detection for barriers and stop setting the barrier flag for discards.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Chris Mason <chris.mason@oracle.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'fs/btrfs/extent-tree.c')
-rw-r--r-- | fs/btrfs/extent-tree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index 32d0940..43dc9ea 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -1696,7 +1696,7 @@ static void btrfs_issue_discard(struct block_device *bdev, u64 start, u64 len) { blkdev_issue_discard(bdev, start >> 9, len >> 9, GFP_KERNEL, - BLKDEV_IFL_WAIT | BLKDEV_IFL_BARRIER); + BLKDEV_IFL_WAIT); } static int btrfs_discard_extent(struct btrfs_root *root, u64 bytenr, |