* linux-next: manual merge of the target-updates tree with the tree
@ 2015-06-01 11:22 Stephen Rothwell
2015-06-01 11:35 ` Nicholas A. Bellinger
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2015-06-01 11:22 UTC (permalink / raw)
To: Nicholas A. Bellinger
Cc: linux-next, linux-kernel, Christoph Hellwig, Andy Grover
[-- Attachment #1: Type: text/plain, Size: 260 bytes --]
Hi Nicholas,
Today's linux-next merge of the target-updates tree got so many
conflicts against Linus' tree that I just gave up and dropped it
completely. Please fix up this mess.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next: manual merge of the target-updates tree with the tree
2015-06-01 11:22 linux-next: manual merge of the target-updates tree with the tree Stephen Rothwell
@ 2015-06-01 11:35 ` Nicholas A. Bellinger
2015-06-01 11:56 ` Stephen Rothwell
0 siblings, 1 reply; 4+ messages in thread
From: Nicholas A. Bellinger @ 2015-06-01 11:35 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Christoph Hellwig, Andy Grover
On Mon, 2015-06-01 at 21:22 +1000, Stephen Rothwell wrote:
> Hi Nicholas,
>
> Today's linux-next merge of the target-updates tree got so many
> conflicts against Linus' tree that I just gave up and dropped it
> completely. Please fix up this mess.
>
Apologies for the conflicts vs. mainline in today's linux-next
The latest in target-pending/for-next from this morning should address
these conflicts vs. mainline.
Thank you,
--nab
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next: manual merge of the target-updates tree with the tree
2015-06-01 11:35 ` Nicholas A. Bellinger
@ 2015-06-01 11:56 ` Stephen Rothwell
0 siblings, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2015-06-01 11:56 UTC (permalink / raw)
To: Nicholas A. Bellinger
Cc: linux-next, linux-kernel, Christoph Hellwig, Andy Grover
[-- Attachment #1: Type: text/plain, Size: 400 bytes --]
Hi Nicholas,
On Mon, 01 Jun 2015 04:35:52 -0700 "Nicholas A. Bellinger" <nab@linux-iscsi.org> wrote:
>
> Apologies for the conflicts vs. mainline in today's linux-next
>
> The latest in target-pending/for-next from this morning should address
> these conflicts vs. mainline.
Thanks, tomorrow should be better :-)
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* linux-next: manual merge of the target-updates tree with the tree
@ 2014-05-23 9:07 Stephen Rothwell
0 siblings, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2014-05-23 9:07 UTC (permalink / raw)
To: Nicholas A. Bellinger, James Bottomley
Cc: linux-next, linux-kernel, Christoph Hellwig
[-- Attachment #1: Type: text/plain, Size: 2608 bytes --]
Hi Nicholas,
Today's linux-next merge of the target-updates tree got a conflict in
drivers/scsi/virtio_scsi.c between commit b54197c43db8 ("virtio_scsi:
use cmd_size") from the scsi tree and commit 4baaa7d589e2
("virtio-scsi: Enable DIF/DIX modes in SCSI host LLD") from the
target-updates tree.
I fixed it up (I think - see below) and can carry the fix as necessary
(no action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/scsi/virtio_scsi.c
index d4727b339474,cc634b0e8f04..000000000000
--- a/drivers/scsi/virtio_scsi.c
+++ b/drivers/scsi/virtio_scsi.c
@@@ -456,9 -537,10 +497,10 @@@ static int virtscsi_queuecommand(struc
struct virtio_scsi_vq *req_vq,
struct scsi_cmnd *sc)
{
- struct virtio_scsi_cmd *cmd;
- int ret, req_size;
-
++ int req_size;
struct Scsi_Host *shost = virtio_scsi_host(vscsi->vdev);
+ struct virtio_scsi_cmd *cmd = scsi_cmd_priv(sc);
+
BUG_ON(scsi_sg_count(sc) > shost->sg_tablesize);
/* TODO: check feature bit and fail if unsupported? */
@@@ -467,27 -549,34 +509,25 @@@
dev_dbg(&sc->device->sdev_gendev,
"cmd %p CDB: %#02x\n", sc, sc->cmnd[0]);
- ret = SCSI_MLQUEUE_HOST_BUSY;
- cmd = mempool_alloc(virtscsi_cmd_pool, GFP_ATOMIC);
- if (!cmd)
- goto out;
-
memset(cmd, 0, sizeof(*cmd));
cmd->sc = sc;
- cmd->req.cmd = (struct virtio_scsi_cmd_req){
- .lun[0] = 1,
- .lun[1] = sc->device->id,
- .lun[2] = (sc->device->lun >> 8) | 0x40,
- .lun[3] = sc->device->lun & 0xff,
- .tag = (unsigned long)sc,
- .task_attr = VIRTIO_SCSI_S_SIMPLE,
- .prio = 0,
- .crn = 0,
- };
BUG_ON(sc->cmd_len > VIRTIO_SCSI_CDB_SIZE);
- memcpy(cmd->req.cmd.cdb, sc->cmnd, sc->cmd_len);
- if (virtscsi_kick_cmd(req_vq, cmd,
- sizeof cmd->req.cmd, sizeof cmd->resp.cmd,
+ if (virtio_has_feature(vscsi->vdev, VIRTIO_SCSI_F_T10_PI)) {
+ virtio_scsi_init_hdr_pi(&cmd->req.cmd_pi, sc);
+ memcpy(cmd->req.cmd_pi.cdb, sc->cmnd, sc->cmd_len);
+ req_size = sizeof(cmd->req.cmd_pi);
+ } else {
+ virtio_scsi_init_hdr(&cmd->req.cmd, sc);
+ memcpy(cmd->req.cmd.cdb, sc->cmnd, sc->cmd_len);
+ req_size = sizeof(cmd->req.cmd);
+ }
+
+ if (virtscsi_kick_cmd(req_vq, cmd, req_size, sizeof(cmd->resp.cmd),
- GFP_ATOMIC) == 0)
- ret = 0;
- else
- mempool_free(cmd, virtscsi_cmd_pool);
-
-out:
- return ret;
+ GFP_ATOMIC) != 0)
+ return SCSI_MLQUEUE_HOST_BUSY;
+ return 0;
}
static int virtscsi_queuecommand_single(struct Scsi_Host *sh,
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-06-01 11:56 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-06-01 11:22 linux-next: manual merge of the target-updates tree with the tree Stephen Rothwell
2015-06-01 11:35 ` Nicholas A. Bellinger
2015-06-01 11:56 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2014-05-23 9:07 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).