diff options
author | Christoph Hellwig <hch@lst.de> | 2010-09-16 14:51:46 -0400 |
---|---|---|
committer | Jens Axboe <jaxboe@fusionio.com> | 2010-09-16 14:52:58 -0400 |
commit | dd3932eddf428571762596e17b65f5dc92ca361b (patch) | |
tree | 57cec5ae2f862037f78b7e993323d77955bb6463 /fs/nilfs2/the_nilfs.c | |
parent | 8786fb70ccb36c7cff64680bb80c46d3a09d44db (diff) |
block: remove BLKDEV_IFL_WAIT
All the blkdev_issue_* helpers can only sanely be used for synchronous
caller. To issue cache flushes or barriers asynchronously the caller needs
to set up a bio by itself with a completion callback to move the asynchronous
state machine ahead. So drop the BLKDEV_IFL_WAIT flag that is always
specified when calling blkdev_issue_* and also remove the now unused flags
argument to blkdev_issue_flush and blkdev_issue_zeroout. For
blkdev_issue_discard we need to keep it for the secure discard flag, which
gains a more descriptive name and loses the bitops vs flag confusion.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'fs/nilfs2/the_nilfs.c')
-rw-r--r-- | fs/nilfs2/the_nilfs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nilfs2/the_nilfs.c b/fs/nilfs2/the_nilfs.c index 400b2caef4d8..d97310f07bef 100644 --- a/fs/nilfs2/the_nilfs.c +++ b/fs/nilfs2/the_nilfs.c | |||
@@ -774,7 +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, BLKDEV_IFL_WAIT); | 777 | GFP_NOFS, 0); |
778 | if (ret < 0) | 778 | if (ret < 0) |
779 | return ret; | 779 | return ret; |
780 | nblocks = 0; | 780 | nblocks = 0; |
@@ -784,7 +784,7 @@ int nilfs_discard_segments(struct the_nilfs *nilfs, __u64 *segnump, | |||
784 | ret = blkdev_issue_discard(nilfs->ns_bdev, | 784 | ret = blkdev_issue_discard(nilfs->ns_bdev, |
785 | start * sects_per_block, | 785 | start * sects_per_block, |
786 | nblocks * sects_per_block, | 786 | nblocks * sects_per_block, |
787 | GFP_NOFS, BLKDEV_IFL_WAIT); | 787 | GFP_NOFS, 0); |
788 | return ret; | 788 | return ret; |
789 | } | 789 | } |
790 | 790 | ||