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

Commit 992b5bce authored by FUJITA Tomonori's avatar FUJITA Tomonori Committed by Jens Axboe
Browse files

block: no need to initialize rq->cmd with blk_get_request 



blk_get_request initializes rq->cmd (rq_init does) so the users don't
need to do that.

The purpose of this patch is to remove sizeof(rq->cmd) and &rq->cmd,
as a preparation for large command support, which changes rq->cmd from
the static array to a pointer. sizeof(rq->cmd) will not make sense and
&rq->cmd won't work.

Signed-off-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: James Bottomley <James.Bottomley@HansenPartnership.com>
Cc: Alasdair G Kergon <agk@redhat.com>
Cc: Jens Axboe <jens.axboe@oracle.com>
Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent 4917fa29

block/scsi_ioctl.c

+0 −3
Original line number Diff line number Diff line
@@ -217,8 +217,6 @@ EXPORT_SYMBOL_GPL(blk_verify_command); 
static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq,

			     struct sg_io_hdr *hdr, int has_write_perm)

{

	memset(rq->cmd, 0, BLK_MAX_CDB); /* ATAPI hates garbage after CDB */



	if (copy_from_user(rq->cmd, hdr->cmdp, hdr->cmd_len))

		return -EFAULT;

	if (blk_verify_command(rq->cmd, has_write_perm))
@@ -531,7 +529,6 @@ static int __blk_send_generic(struct request_queue *q, struct gendisk *bd_disk, 
	rq->data_len = 0;

	rq->extra_len = 0;

	rq->timeout = BLK_DEFAULT_SG_TIMEOUT;

	memset(rq->cmd, 0, sizeof(rq->cmd));

	rq->cmd[0] = cmd;

	rq->cmd[4] = data;

	rq->cmd_len = 6;

drivers/block/pktcdvd.c

+0 −2
Original line number Diff line number Diff line
@@ -776,8 +776,6 @@ static int pkt_generic_packet(struct pktcdvd_device *pd, struct packet_command * 


	rq->cmd_len = COMMAND_SIZE(cgc->cmd[0]);

	memcpy(rq->cmd, cgc->cmd, CDROM_PACKET_SIZE);

	if (sizeof(rq->cmd) > CDROM_PACKET_SIZE)

		memset(rq->cmd + CDROM_PACKET_SIZE, 0, sizeof(rq->cmd) - CDROM_PACKET_SIZE);



	rq->timeout = 60*HZ;

	rq->cmd_type = REQ_TYPE_BLOCK_PC;

drivers/cdrom/cdrom.c

+0 −1
Original line number Diff line number Diff line
@@ -2194,7 +2194,6 @@ static int cdrom_read_cdda_bpc(struct cdrom_device_info *cdi, __u8 __user *ubuf, 
		if (ret)

			break;



		memset(rq->cmd, 0, sizeof(rq->cmd));

		rq->cmd[0] = GPCMD_READ_CD;

		rq->cmd[1] = 1 << 2;

		rq->cmd[2] = (lba >> 24) & 0xff;

drivers/md/dm-emc.c

+0 −2
Original line number Diff line number Diff line
@@ -110,8 +110,6 @@ static struct request *get_failover_req(struct emc_handler *h, 
	memset(rq->sense, 0, SCSI_SENSE_BUFFERSIZE);

	rq->sense_len = 0;



	memset(&rq->cmd, 0, BLK_MAX_CDB);



	rq->timeout = EMC_FAILOVER_TIMEOUT;

	rq->cmd_type = REQ_TYPE_BLOCK_PC;

	rq->cmd_flags |= REQ_FAILFAST | REQ_NOMERGE;

drivers/md/dm-mpath-hp-sw.c

+0 −1
Original line number Diff line number Diff line
@@ -137,7 +137,6 @@ static struct request *hp_sw_get_request(struct dm_path *path) 
	req->sense = h->sense;

	memset(req->sense, 0, SCSI_SENSE_BUFFERSIZE);



	memset(&req->cmd, 0, BLK_MAX_CDB);

	req->cmd[0] = START_STOP;

	req->cmd[4] = 1;

	req->cmd_len = COMMAND_SIZE(req->cmd[0]);