[Xen-changelog] [linux-2.6.18-xen] [PVSCSI] bug fix report_lun

["Xen patchbot-linux-2.6.18-xen" <patchbot-linux-2.6.18-xen@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1228827758 0
# Node ID eccc622d03af649ed32981d979263893f99d75f4
# Parent  3669e92f24cd82bc4b5a03b199f90465558123f6
[PVSCSI] bug fix report_lun

Signed-off-by: James Harper <james.harper@xxxxxxxxxxxxxxxx>
Signed-off-by: Tomonari Horikoshi <t.horikoshi@xxxxxxxxxxxxxx>
Signed-off-by: Jun Kamada <kama@xxxxxxxxxxxxxx>
---
 drivers/xen/scsiback/common.h   |    2 ++
 drivers/xen/scsiback/emulate.c  |    4 ++--
 drivers/xen/scsiback/scsiback.c |    4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff -r 3669e92f24cd -r eccc622d03af drivers/xen/scsiback/common.h
--- a/drivers/xen/scsiback/common.h     Tue Dec 09 13:02:20 2008 +0000
+++ b/drivers/xen/scsiback/common.h     Tue Dec 09 13:02:38 2008 +0000
@@ -112,6 +112,8 @@ typedef struct {
 
        uint16_t rqid;
        
+       uint16_t v_chn, v_tgt;
+
        uint8_t nr_segments;
        uint8_t cmnd[VSCSIIF_MAX_COMMAND_SIZE];
        uint8_t cmd_len;
diff -r 3669e92f24cd -r eccc622d03af drivers/xen/scsiback/emulate.c
--- a/drivers/xen/scsiback/emulate.c    Tue Dec 09 13:02:20 2008 +0000
+++ b/drivers/xen/scsiback/emulate.c    Tue Dec 09 13:02:38 2008 +0000
@@ -208,8 +208,8 @@ static void __report_luns(pending_req_t 
 static void __report_luns(pending_req_t *pending_req, void *data)
 {
        struct vscsibk_info *info   = pending_req->info;
-       unsigned int        channel = pending_req->sdev->channel;
-       unsigned int        target  = pending_req->sdev->id;
+       unsigned int        channel = pending_req->v_chn;
+       unsigned int        target  = pending_req->v_tgt;
        unsigned int        nr_seg  = pending_req->nr_segments;
        unsigned char *cmd = (unsigned char *)pending_req->cmnd;
        
diff -r 3669e92f24cd -r eccc622d03af drivers/xen/scsiback/scsiback.c
--- a/drivers/xen/scsiback/scsiback.c   Tue Dec 09 13:02:20 2008 +0000
+++ b/drivers/xen/scsiback/scsiback.c   Tue Dec 09 13:02:38 2008 +0000
@@ -513,8 +513,8 @@ static int prepare_pending_reqs(struct v
 
        pending_req->info       = info;
 
-       vir.chn = ring_req->channel;
-       vir.tgt = ring_req->id;
+       pending_req->v_chn = vir.chn = ring_req->channel;
+       pending_req->v_tgt = vir.tgt = ring_req->id;
        vir.lun = ring_req->lun;
 
        rmb();

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog