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

Commit 4f54eec8 authored by FUJITA Tomonori's avatar FUJITA Tomonori Committed by Jens Axboe
Browse files

block: use blk_rq_init() to initialize the request 



Any path needs to call it to initialize the request.

This is a preparation for large command support, which needs to
initialize the request in a proper way (that is, just doing a memset()
will not work).

Signed-off-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: Jens Axboe <jens.axboe@oracle.com>
Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent 2a4aa30c

drivers/block/nbd.c

+1 −0
Original line number Diff line number Diff line
@@ -537,6 +537,7 @@ static int nbd_ioctl(struct inode *inode, struct file *file, 
	switch (cmd) {

	case NBD_DISCONNECT:

	        printk(KERN_INFO "%s: NBD_DISCONNECT\n", lo->disk->disk_name);

		blk_rq_init(NULL, &sreq);

		sreq.cmd_type = REQ_TYPE_SPECIAL;

		nbd_cmd(&sreq) = NBD_CMD_DISC;

		/*

drivers/block/paride/pd.c

+1 −3
Original line number Diff line number Diff line
@@ -716,10 +716,8 @@ static int pd_special_command(struct pd_unit *disk, 
	struct request rq;

	int err = 0;



	memset(&rq, 0, sizeof(rq));

	rq.errors = 0;

	blk_rq_init(NULL, &rq);

	rq.rq_disk = disk->gd;

	rq.ref_count = 1;

	rq.end_io_data = &wait;

	rq.end_io = blk_end_sync_rq;

	blk_insert_request(disk->gd->queue, &rq, 0, func);

drivers/scsi/scsi_error.c

+1 −0
Original line number Diff line number Diff line
@@ -1771,6 +1771,7 @@ scsi_reset_provider(struct scsi_device *dev, int flag) 
	unsigned long flags;

	int rtn;



	blk_rq_init(NULL, &req);

	scmd->request = &req;

	memset(&scmd->eh_timeout, 0, sizeof(scmd->eh_timeout));