diff options
author | Christoph Hellwig <hch@infradead.org> | 2010-08-18 05:29:18 -0400 |
---|---|---|
committer | Jens Axboe <jaxboe@fusionio.com> | 2010-09-10 06:35:39 -0400 |
commit | 61002f7db33c7d064cddcdab680fb750fa43d8fd (patch) | |
tree | a9a4a9f6288478cc91934b0784e31649faaa8efb /fs | |
parent | 9c35575bbe6b1dd4914a5323c8df8b3159edcc75 (diff) |
ext4: do not send discards as barriers
ext4 already uses synchronous discards, no need to add I/O barriers.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/ext4/mballoc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index df44b345f662..a22bfef3da95 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c | |||
@@ -2567,7 +2567,7 @@ static inline void ext4_issue_discard(struct super_block *sb, | |||
2567 | trace_ext4_discard_blocks(sb, | 2567 | trace_ext4_discard_blocks(sb, |
2568 | (unsigned long long) discard_block, count); | 2568 | (unsigned long long) discard_block, count); |
2569 | ret = sb_issue_discard(sb, discard_block, count, GFP_NOFS, | 2569 | ret = sb_issue_discard(sb, discard_block, count, GFP_NOFS, |
2570 | BLKDEV_IFL_WAIT | BLKDEV_IFL_BARRIER); | 2570 | BLKDEV_IFL_WAIT); |
2571 | if (ret == EOPNOTSUPP) { | 2571 | if (ret == EOPNOTSUPP) { |
2572 | ext4_warning(sb, "discard not supported, disabling"); | 2572 | ext4_warning(sb, "discard not supported, disabling"); |
2573 | clear_opt(EXT4_SB(sb)->s_mount_opt, DISCARD); | 2573 | clear_opt(EXT4_SB(sb)->s_mount_opt, DISCARD); |