diff options
-rw-r--r-- | drivers/block/nbd.c | 1 | ||||
-rw-r--r-- | drivers/block/paride/pd.c | 4 | ||||
-rw-r--r-- | drivers/scsi/scsi_error.c | 1 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c index 60cc54368b66..f75bda16a1fc 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c | |||
@@ -537,6 +537,7 @@ static int nbd_ioctl(struct inode *inode, struct file *file, | |||
537 | switch (cmd) { | 537 | switch (cmd) { |
538 | case NBD_DISCONNECT: | 538 | case NBD_DISCONNECT: |
539 | printk(KERN_INFO "%s: NBD_DISCONNECT\n", lo->disk->disk_name); | 539 | printk(KERN_INFO "%s: NBD_DISCONNECT\n", lo->disk->disk_name); |
540 | blk_rq_init(NULL, &sreq); | ||
540 | sreq.cmd_type = REQ_TYPE_SPECIAL; | 541 | sreq.cmd_type = REQ_TYPE_SPECIAL; |
541 | nbd_cmd(&sreq) = NBD_CMD_DISC; | 542 | nbd_cmd(&sreq) = NBD_CMD_DISC; |
542 | /* | 543 | /* |
diff --git a/drivers/block/paride/pd.c b/drivers/block/paride/pd.c index df819f8a95a6..570f3b70dce7 100644 --- a/drivers/block/paride/pd.c +++ b/drivers/block/paride/pd.c | |||
@@ -716,10 +716,8 @@ static int pd_special_command(struct pd_unit *disk, | |||
716 | struct request rq; | 716 | struct request rq; |
717 | int err = 0; | 717 | int err = 0; |
718 | 718 | ||
719 | memset(&rq, 0, sizeof(rq)); | 719 | blk_rq_init(NULL, &rq); |
720 | rq.errors = 0; | ||
721 | rq.rq_disk = disk->gd; | 720 | rq.rq_disk = disk->gd; |
722 | rq.ref_count = 1; | ||
723 | rq.end_io_data = &wait; | 721 | rq.end_io_data = &wait; |
724 | rq.end_io = blk_end_sync_rq; | 722 | rq.end_io = blk_end_sync_rq; |
725 | blk_insert_request(disk->gd->queue, &rq, 0, func); | 723 | blk_insert_request(disk->gd->queue, &rq, 0, func); |
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c index 221f31e36d26..1eaba6cd80f4 100644 --- a/drivers/scsi/scsi_error.c +++ b/drivers/scsi/scsi_error.c | |||
@@ -1771,6 +1771,7 @@ scsi_reset_provider(struct scsi_device *dev, int flag) | |||
1771 | unsigned long flags; | 1771 | unsigned long flags; |
1772 | int rtn; | 1772 | int rtn; |
1773 | 1773 | ||
1774 | blk_rq_init(NULL, &req); | ||
1774 | scmd->request = &req; | 1775 | scmd->request = &req; |
1775 | memset(&scmd->eh_timeout, 0, sizeof(scmd->eh_timeout)); | 1776 | memset(&scmd->eh_timeout, 0, sizeof(scmd->eh_timeout)); |
1776 | 1777 | ||