aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nilfs2/the_nilfs.c
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@infradead.org>2010-08-18 05:29:15 -0400
committerJens Axboe <jaxboe@fusionio.com>2010-09-10 06:35:39 -0400
commitf8c131f5b6ffc899a70b30e541f367d47f89691c (patch)
treec1f4bc92dc382b80004b5b63223f16e67219986e /fs/nilfs2/the_nilfs.c
parent7cd33ad23ec41d685902159be8b2c6552fab8bd0 (diff)
nilfs2: 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. tj: nilfs is now fixed to wait for discard completion. Updated this patch accordingly and dropped warning about it. Signed-off-by: Christoph Hellwig <hch@lst.de> Acked-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp> Signed-off-by: Tejun Heo <tj@kernel.org> Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'fs/nilfs2/the_nilfs.c')
-rw-r--r--fs/nilfs2/the_nilfs.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/fs/nilfs2/the_nilfs.c b/fs/nilfs2/the_nilfs.c
index 4317f177ea7c..400b2caef4d8 100644
--- a/fs/nilfs2/the_nilfs.c
+++ b/fs/nilfs2/the_nilfs.c
@@ -774,9 +774,7 @@ int nilfs_discard_segments(struct the_nilfs *nilfs, __u64 *segnump,
774 ret = blkdev_issue_discard(nilfs->ns_bdev, 774 ret = blkdev_issue_discard(nilfs->ns_bdev,
775 start * sects_per_block, 775 start * sects_per_block,
776 nblocks * sects_per_block, 776 nblocks * sects_per_block,
777 GFP_NOFS, 777 GFP_NOFS, BLKDEV_IFL_WAIT);
778 BLKDEV_IFL_WAIT |
779 BLKDEV_IFL_BARRIER);
780 if (ret < 0) 778 if (ret < 0)
781 return ret; 779 return ret;
782 nblocks = 0; 780 nblocks = 0;
@@ -786,8 +784,7 @@ int nilfs_discard_segments(struct the_nilfs *nilfs, __u64 *segnump,
786 ret = blkdev_issue_discard(nilfs->ns_bdev, 784 ret = blkdev_issue_discard(nilfs->ns_bdev,
787 start * sects_per_block, 785 start * sects_per_block,
788 nblocks * sects_per_block, 786 nblocks * sects_per_block,
789 GFP_NOFS, 787 GFP_NOFS, BLKDEV_IFL_WAIT);
790 BLKDEV_IFL_WAIT | BLKDEV_IFL_BARRIER);
791 return ret; 788 return ret;
792} 789}
793 790