1 From: Hannes Reinecke <hare@suse.de>
2 Subject: Update XEN scsifront driver to request timeouts
3 Patch-mainline: obsolete
5 Update XEN scsifront driver to the block request handling
8 Signed-off-by: Hannes Reinecke <hare@suse.de>
10 Index: head-2008-09-15/drivers/xen/scsifront/scsifront.c
11 ===================================================================
12 --- head-2008-09-15.orig/drivers/xen/scsifront/scsifront.c 2008-09-15 15:22:09.000000000 +0200
13 +++ head-2008-09-15/drivers/xen/scsifront/scsifront.c 2008-09-15 15:22:12.000000000 +0200
14 @@ -348,7 +348,7 @@ static int scsifront_queuecommand(struct
15 memset(ring_req->cmnd, 0, VSCSIIF_MAX_COMMAND_SIZE);
17 ring_req->sc_data_direction = (uint8_t)sc->sc_data_direction;
18 - ring_req->timeout_per_command = (sc->timeout_per_command / HZ);
19 + ring_req->timeout_per_command = (sc->request->timeout / HZ);
21 info->shadow[rqid].req_scsi_cmnd = (unsigned long)sc;
22 info->shadow[rqid].sc_data_direction = sc->sc_data_direction;
23 @@ -418,7 +418,7 @@ static int scsifront_dev_reset_handler(s
24 memset(ring_req->cmnd, 0, VSCSIIF_MAX_COMMAND_SIZE);
26 ring_req->sc_data_direction = (uint8_t)sc->sc_data_direction;
27 - ring_req->timeout_per_command = (sc->timeout_per_command / HZ);
28 + ring_req->timeout_per_command = (sc->request->timeout / HZ);
29 ring_req->nr_segments = 0;
31 scsifront_do_request(info);