fs: remove the unused error argument to dio_end_io()

Christoph Hellwig · axboe · commit 4055351cdbb4 · 2017-06-09T09:27:32.000-06:00
Signed-off-by: Christoph Hellwig &lt;hch@lst.de&gt;
Reviewed-by: Bart Van Assche &lt;Bart.VanAssche@sandisk.com&gt;
Signed-off-by: Jens Axboe &lt;axboe@fb.com&gt;
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
@@ -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);
diff --git a/fs/direct-io.c b/fs/direct-io.c
@@ -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;
 
diff --git a/include/linux/fs.h b/include/linux/fs.h
@@ -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,

Original file line number	Diff line number	Diff line change
`@@ -348,13 +348,12 @@ static void dio_bio_end_io(struct bio *bio)`
`348`	`348`	`/**`
`349`	`349`	`* dio_end_io - handle the end io action for the given bio`
`350`	`350`	`* @bio: The direct io bio thats being completed`
`351`		`- * @error: Error if there was one`
`352`	`351`	`*`
`353`	`352`	`* This is meant to be called by any filesystem that uses their own dio_submit_t`
`354`	`353`	`* so that the DIO specific endio actions are dealt with after the filesystem`
`355`	`354`	`* has done it's completion work.`
`356`	`355`	`*/`
`357`		`-void dio_end_io(struct bio *bio, int error)`
	`356`	`+void dio_end_io(struct bio *bio)`
`358`	`357`	`{`
`359`	`358`	`struct dio *dio = bio->bi_private;`
`360`	`359`