redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

fs: remove the unused error argument to dio_end_io() 

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Bart Van Assche <Bart.VanAssche@sandisk.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
hifive-unleashed-5.1
Christoph Hellwig 2017-06-03 09:37:58 +02:00 committed by Jens Axboe
parent 9966afaf91
commit 4055351cdb
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fs/btrfs/inode.c
View File

@ -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)
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 @@ free_ordered:
* 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);

3
fs/direct-io.c
View File

@ -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;

2
include/linux/fs.h
View File

@ -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,