diff options
| author | James Bottomley <JBottomley@Parallels.com> | 2014-12-18 05:56:29 -0800 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2014-12-18 05:56:29 -0800 |
| commit | e61745769125a3c788e7aceb2a5fb680ebb461e6 (patch) | |
| tree | c8219c31767c8d6a64938626dd93069847d1d5b8 /drivers/xen | |
| parent | 198a956a11b15b564ac06d1411881e215b587408 (diff) | |
| parent | e86fb5e8ab95f10ec5f2e9430119d5d35020c951 (diff) | |
| download | op-kernel-dev-e61745769125a3c788e7aceb2a5fb680ebb461e6.zip op-kernel-dev-e61745769125a3c788e7aceb2a5fb680ebb461e6.tar.gz | |
Merge remote-tracking branch 'scsi-queue/drivers-for-3.19' into for-linus
Diffstat (limited to 'drivers/xen')
| -rw-r--r-- | drivers/xen/xen-scsiback.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/xen/xen-scsiback.c b/drivers/xen/xen-scsiback.c index 50610a6..e999496e 100644 --- a/drivers/xen/xen-scsiback.c +++ b/drivers/xen/xen-scsiback.c @@ -606,7 +606,7 @@ static void scsiback_device_action(struct vscsibk_pend *pending_req, init_waitqueue_head(&tmr->tmr_wait); transport_init_se_cmd(se_cmd, tpg->se_tpg.se_tpg_tfo, - tpg->tpg_nexus->tvn_se_sess, 0, DMA_NONE, MSG_SIMPLE_TAG, + tpg->tpg_nexus->tvn_se_sess, 0, DMA_NONE, TCM_SIMPLE_TAG, &pending_req->sense_buffer[0]); rc = core_tmr_alloc_req(se_cmd, tmr, act, GFP_KERNEL); |
