Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4055351c authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

fs: remove the unused error argument to dio_end_io()

parent 9966afaf
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -8244,7 +8244,7 @@ static void btrfs_endio_direct_read(struct bio *bio)
	kfree(dip);

	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)
		io_bio->end_io(io_bio, err);
@@ -8304,7 +8304,7 @@ static void btrfs_endio_direct_write(struct bio *bio)
	kfree(dip);

	dio_bio->bi_error = bio->bi_error;
	dio_end_io(dio_bio, bio->bi_error);
	dio_end_io(dio_bio);
	bio_put(bio);
}

@@ -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()
		 * nor bio_endio()/bio_io_error() against dio_bio.
		 */
		dio_end_io(dio_bio, ret);
		dio_end_io(dio_bio);
	}
	if (io_bio)
		bio_put(io_bio);
+1 −2
Original line number Diff line number Diff line
@@ -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
 * @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
 * so that the DIO specific endio actions are dealt with after the filesystem
 * 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;

+1 −1
Original line number Diff line number Diff line
@@ -2843,7 +2843,7 @@ enum {
	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,
			     struct block_device *bdev, struct iov_iter *iter,