Commit 6b19b766 authored by Jens Axboe's avatar Jens Axboe
Browse files

fs: get rid of the res2 iocb->ki_complete argument 



The second argument was only used by the USB gadget code, yet everyone
pays the overhead of passing a zero to be passed into aio, where it
ends up being part of the aio res2 value.

Now that everybody is passing in zero, kill off the extra argument.

Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 4c3d8acc

block/fops.c

+1 −1
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ static void blkdev_bio_end_io(struct bio *bio) 
				ret = blk_status_to_errno(dio->bio.bi_status);

			}



			dio->iocb->ki_complete(iocb, ret, 0);

			dio->iocb->ki_complete(iocb, ret);

			if (dio->flags & DIO_MULTI_BIO)

				bio_put(&dio->bio);

		} else {

crypto/af_alg.c

+1 −1
Original line number Diff line number Diff line
@@ -1076,7 +1076,7 @@ void af_alg_async_cb(struct crypto_async_request *_req, int err) 
	af_alg_free_resources(areq);

	sock_put(sk);



	iocb->ki_complete(iocb, err ? err : (int)resultlen, 0);

	iocb->ki_complete(iocb, err ? err : (int)resultlen);

}

EXPORT_SYMBOL_GPL(af_alg_async_cb);

drivers/block/loop.c

+2 −2
Original line number Diff line number Diff line
@@ -554,7 +554,7 @@ static void lo_rw_aio_do_completion(struct loop_cmd *cmd) 
		blk_mq_complete_request(rq);

}



static void lo_rw_aio_complete(struct kiocb *iocb, long ret, long ret2)

static void lo_rw_aio_complete(struct kiocb *iocb, long ret)

{

	struct loop_cmd *cmd = container_of(iocb, struct loop_cmd, iocb);
@@ -627,7 +627,7 @@ static int lo_rw_aio(struct loop_device *lo, struct loop_cmd *cmd, 
	lo_rw_aio_do_completion(cmd);



	if (ret != -EIOCBQUEUED)

		cmd->iocb.ki_complete(&cmd->iocb, ret, 0);

		lo_rw_aio_complete(&cmd->iocb, ret);

	return 0;

}

drivers/nvme/target/io-cmd-file.c

+2 −2
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ static ssize_t nvmet_file_submit_bvec(struct nvmet_req *req, loff_t pos, 
	return call_iter(iocb, &iter);

}



static void nvmet_file_io_done(struct kiocb *iocb, long ret, long ret2)

static void nvmet_file_io_done(struct kiocb *iocb, long ret)

{

	struct nvmet_req *req = container_of(iocb, struct nvmet_req, f.iocb);

	u16 status = NVME_SC_SUCCESS;
@@ -222,7 +222,7 @@ static bool nvmet_file_execute_io(struct nvmet_req *req, int ki_flags) 
	}



complete:

	nvmet_file_io_done(&req->f.iocb, ret, 0);

	nvmet_file_io_done(&req->f.iocb, ret);

	return true;

}

drivers/target/target_core_file.c

+2 −2
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ struct target_core_file_cmd { 
	struct bio_vec	bvecs[];

};



static void cmd_rw_aio_complete(struct kiocb *iocb, long ret, long ret2)

static void cmd_rw_aio_complete(struct kiocb *iocb, long ret)

{

	struct target_core_file_cmd *cmd;
@@ -303,7 +303,7 @@ fd_execute_rw_aio(struct se_cmd *cmd, struct scatterlist *sgl, u32 sgl_nents, 
		ret = call_read_iter(file, &aio_cmd->iocb, &iter);



	if (ret != -EIOCBQUEUED)

		cmd_rw_aio_complete(&aio_cmd->iocb, ret, 0);

		cmd_rw_aio_complete(&aio_cmd->iocb, ret);



	return 0;

}