提交 4055351c 编写于 作者: C Christoph Hellwig 提交者: Jens Axboe

fs: remove the unused error argument to dio_end_io()

Signed-off-by: NChristoph Hellwig <hch@lst.de>
Reviewed-by: NBart Van Assche <Bart.VanAssche@sandisk.com>
Signed-off-by: NJens Axboe <axboe@fb.com>
上级 9966afaf
...@@ -8244,7 +8244,7 @@ static void btrfs_endio_direct_read(struct bio *bio) ...@@ -8244,7 +8244,7 @@ static void btrfs_endio_direct_read(struct bio *bio)
kfree(dip); kfree(dip);
dio_bio->bi_error = bio->bi_error; dio_bio->bi_error = bio->bi_error;
dio_end_io(dio_bio, bio->bi_error); dio_end_io(dio_bio);
if (io_bio->end_io) if (io_bio->end_io)
io_bio->end_io(io_bio, err); io_bio->end_io(io_bio, err);
...@@ -8304,7 +8304,7 @@ static void btrfs_endio_direct_write(struct bio *bio) ...@@ -8304,7 +8304,7 @@ static void btrfs_endio_direct_write(struct bio *bio)
kfree(dip); kfree(dip);
dio_bio->bi_error = bio->bi_error; dio_bio->bi_error = bio->bi_error;
dio_end_io(dio_bio, bio->bi_error); dio_end_io(dio_bio);
bio_put(bio); bio_put(bio);
} }
...@@ -8673,7 +8673,7 @@ static void btrfs_submit_direct(struct bio *dio_bio, struct inode *inode, ...@@ -8673,7 +8673,7 @@ static void btrfs_submit_direct(struct bio *dio_bio, struct inode *inode,
* Releases and cleans up our dio_bio, no need to bio_put() * Releases and cleans up our dio_bio, no need to bio_put()
* nor bio_endio()/bio_io_error() against dio_bio. * nor bio_endio()/bio_io_error() against dio_bio.
*/ */
dio_end_io(dio_bio, ret); dio_end_io(dio_bio);
} }
if (io_bio) if (io_bio)
bio_put(io_bio); bio_put(io_bio);
......
...@@ -348,13 +348,12 @@ static void dio_bio_end_io(struct bio *bio) ...@@ -348,13 +348,12 @@ static void dio_bio_end_io(struct bio *bio)
/** /**
* dio_end_io - handle the end io action for the given bio * dio_end_io - handle the end io action for the given bio
* @bio: The direct io bio thats being completed * @bio: The direct io bio thats being completed
* @error: Error if there was one
* *
* This is meant to be called by any filesystem that uses their own dio_submit_t * This is meant to be called by any filesystem that uses their own dio_submit_t
* so that the DIO specific endio actions are dealt with after the filesystem * so that the DIO specific endio actions are dealt with after the filesystem
* has done it's completion work. * has done it's completion work.
*/ */
void dio_end_io(struct bio *bio, int error) void dio_end_io(struct bio *bio)
{ {
struct dio *dio = bio->bi_private; struct dio *dio = bio->bi_private;
......
...@@ -2843,7 +2843,7 @@ enum { ...@@ -2843,7 +2843,7 @@ enum {
DIO_SKIP_DIO_COUNT = 0x08, DIO_SKIP_DIO_COUNT = 0x08,
}; };
void dio_end_io(struct bio *bio, int error); void dio_end_io(struct bio *bio);
ssize_t __blockdev_direct_IO(struct kiocb *iocb, struct inode *inode, ssize_t __blockdev_direct_IO(struct kiocb *iocb, struct inode *inode,
struct block_device *bdev, struct iov_iter *iter, struct block_device *bdev, struct iov_iter *iter,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册