Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

block: Change argument type of scsi_req_init()

Since scsi_req_init() works on a struct scsi_request, change the
argument type into struct scsi_request *.

Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

authored by

Bart Van Assche and committed by
Jens Axboe
c8d9cf22 ca18d6f7

+13 -7
+7 -3
block/scsi_ioctl.c
··· 741 741 } 742 742 EXPORT_SYMBOL(scsi_cmd_blk_ioctl); 743 743 744 - void scsi_req_init(struct request *rq) 744 + /** 745 + * scsi_req_init - initialize certain fields of a scsi_request structure 746 + * @req: Pointer to a scsi_request structure. 747 + * Initializes .__cmd[], .cmd, .cmd_len and .sense_len but no other members 748 + * of struct scsi_request. 749 + */ 750 + void scsi_req_init(struct scsi_request *req) 745 751 { 746 - struct scsi_request *req = scsi_req(rq); 747 - 748 752 memset(req->__cmd, 0, sizeof(req->__cmd)); 749 753 req->cmd = req->__cmd; 750 754 req->cmd_len = BLK_MAX_CDB;
+1 -1
drivers/ide/ide-atapi.c
··· 199 199 memset(sense, 0, sizeof(*sense)); 200 200 201 201 blk_rq_init(rq->q, sense_rq); 202 - scsi_req_init(sense_rq); 202 + scsi_req_init(req); 203 203 204 204 err = blk_rq_map_kern(drive->queue, sense_rq, sense, sense_len, 205 205 GFP_NOIO);
+1 -1
drivers/ide/ide-probe.c
··· 745 745 { 746 746 struct ide_request *req = blk_mq_rq_to_pdu(rq); 747 747 748 - scsi_req_init(rq); 748 + scsi_req_init(&req->sreq); 749 749 req->sreq.sense = req->sense; 750 750 } 751 751
+3 -1
drivers/scsi/scsi_lib.c
··· 1123 1123 */ 1124 1124 void scsi_initialize_rq(struct request *rq) 1125 1125 { 1126 - scsi_req_init(rq); 1126 + struct scsi_cmnd *cmd = blk_mq_rq_to_pdu(rq); 1127 + 1128 + scsi_req_init(&cmd->req); 1127 1129 } 1128 1130 EXPORT_SYMBOL(scsi_initialize_rq); 1129 1131
+1 -1
include/scsi/scsi_request.h
··· 27 27 kfree(req->cmd); 28 28 } 29 29 30 - void scsi_req_init(struct request *); 30 + void scsi_req_init(struct scsi_request *req); 31 31 32 32 #endif /* _SCSI_SCSI_REQUEST_H */