diff for duplicates of <1492554858.2689.17.camel@sandisk.com> diff --git a/a/1.txt b/N1/1.txt index b42f5ac..ae8aa28 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,10 +1,11 @@ On Tue, 2017-04-18 at 08:52 -0700, Christoph Hellwig wrote: > --- a/block/bsg.c > +++ b/block/bsg.c -> @@ -391,13 +391,13 @@ static int blk_complete_sgv4_hdr_rq(struct request *rq, struct sg_io_v4 *hdr, -> struct scsi_request *req = scsi_req(rq); -> int ret = 0; -> +> @@ -391,13 +391,13 @@ static int blk_complete_sgv4_hdr_rq(struct request = +*rq, struct sg_io_v4 *hdr, +> struct scsi_request *req =3D scsi_req(rq); +> int ret =3D 0; +> =20 > - dprintk("rq %p bio %p 0x%x\n", rq, bio, rq->errors); > + dprintk("rq %p bio %p 0x%x\n", rq, bio, rq->result); @@ -14,13 +15,15 @@ Did you perhaps intend "req->result" instead of "rq->result"? > --- a/drivers/scsi/scsi_lib.c > +++ b/drivers/scsi/scsi_lib.c -> @@ -229,8 +229,8 @@ void scsi_queue_insert(struct scsi_cmnd *cmd, int reason) +> @@ -229,8 +229,8 @@ void scsi_queue_insert(struct scsi_cmnd *cmd, int rea= +son) > * @rq_flags: flags for ->rq_flags > * @resid: optional residual length > * > - * returns the req->errors value which is the scsi_cmnd result > - * field. -> + * Returns the scsi_cmnd result field if a command was executed, or a negative +> + * Returns the scsi_cmnd result field if a command was executed, or a ne= +gative > + * Linux error code if we didn't get that war. Did you intend "war" or is that perhaps a typo? @@ -35,4 +38,4 @@ Did you intend "war" or is that perhaps a typo? Why has cmd->request->errors been changed into 0? -Bart. +Bart.= diff --git a/a/content_digest b/N1/content_digest index d22154f..77ee4ab 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -19,10 +19,11 @@ "On Tue, 2017-04-18 at 08:52 -0700, Christoph Hellwig wrote:\n" "> --- a/block/bsg.c\n" "> +++ b/block/bsg.c\n" - "> @@ -391,13 +391,13 @@ static int blk_complete_sgv4_hdr_rq(struct request *rq, struct sg_io_v4 *hdr,\n" - "> \tstruct scsi_request *req = scsi_req(rq);\n" - "> \tint ret = 0;\n" - "> \n" + "> @@ -391,13 +391,13 @@ static int blk_complete_sgv4_hdr_rq(struct request =\n" + "*rq, struct sg_io_v4 *hdr,\n" + "> \tstruct scsi_request *req =3D scsi_req(rq);\n" + "> \tint ret =3D 0;\n" + "> =20\n" "> -\tdprintk(\"rq %p bio %p 0x%x\\n\", rq, bio, rq->errors);\n" "> +\tdprintk(\"rq %p bio %p 0x%x\\n\", rq, bio, rq->result);\n" "\n" @@ -32,13 +33,15 @@ "\n" "> --- a/drivers/scsi/scsi_lib.c\n" "> +++ b/drivers/scsi/scsi_lib.c\n" - "> @@ -229,8 +229,8 @@ void scsi_queue_insert(struct scsi_cmnd *cmd, int reason)\n" + "> @@ -229,8 +229,8 @@ void scsi_queue_insert(struct scsi_cmnd *cmd, int rea=\n" + "son)\n" "> * @rq_flags:\tflags for ->rq_flags\n" "> * @resid:\toptional residual length\n" "> *\n" "> - * returns the req->errors value which is the scsi_cmnd result\n" "> - * field.\n" - "> + * Returns the scsi_cmnd result field if a command was executed, or a negative\n" + "> + * Returns the scsi_cmnd result field if a command was executed, or a ne=\n" + "gative\n" "> + * Linux error code if we didn't get that war.\n" "\n" "Did you intend \"war\" or is that perhaps a typo?\n" @@ -53,6 +56,6 @@ "\n" "Why has cmd->request->errors been changed into 0?\n" "\n" - Bart. + Bart.= -8706ac577c2d7db1a6cf8663f01a6e36ad6fd173a7552bbc8553c602a681666f +6ef6bc839d58477bfb2589fedef6236825a82ec6d4530cc8cf05d0257fd9f735
diff --git a/a/1.txt b/N2/1.txt index b42f5ac..48073d9 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,4 +1,4 @@ -On Tue, 2017-04-18 at 08:52 -0700, Christoph Hellwig wrote: +On Tue, 2017-04-18@08:52 -0700, Christoph Hellwig wrote: > --- a/block/bsg.c > +++ b/block/bsg.c > @@ -391,13 +391,13 @@ static int blk_complete_sgv4_hdr_rq(struct request *rq, struct sg_io_v4 *hdr, diff --git a/a/content_digest b/N2/content_digest index d22154f..a0fb2c3 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,22 +1,11 @@ "ref\020170418155229.5977-1-hch@bombadil.infradead.org\0" "ref\020170418155229.5977-8-hch@bombadil.infradead.org\0" - "From\0Bart Van Assche <Bart.VanAssche@sandisk.com>\0" - "Subject\0Re: scsi: introduce a new result field in struct scsi_request\0" + "From\0Bart.VanAssche@sandisk.com (Bart Van Assche)\0" + "Subject\0scsi: introduce a new result field in struct scsi_request\0" "Date\0Tue, 18 Apr 2017 22:34:20 +0000\0" - "To\0hch@bombadil.infradead.org <hch@bombadil.infradead.org>" - " axboe@kernel.dk <axboe@kernel.dk>\0" - "Cc\0linux-block@vger.kernel.org <linux-block@vger.kernel.org>" - hch@lst.de <hch@lst.de> - konrad.wilk@oracle.com <konrad.wilk@oracle.com> - roger.pau@citrix.com <roger.pau@citrix.com> - linux-scsi@vger.kernel.org <linux-scsi@vger.kernel.org> - linux-nvme@lists.infradead.org <linux-nvme@lists.infradead.org> - jbacik@fb.com <jbacik@fb.com> - james.smart@broadcom.com <james.smart@broadcom.com> - " dm-devel@redhat.com <dm-devel@redhat.com>\0" "\00:1\0" "b\0" - "On Tue, 2017-04-18 at 08:52 -0700, Christoph Hellwig wrote:\n" + "On Tue, 2017-04-18@08:52 -0700, Christoph Hellwig wrote:\n" "> --- a/block/bsg.c\n" "> +++ b/block/bsg.c\n" "> @@ -391,13 +391,13 @@ static int blk_complete_sgv4_hdr_rq(struct request *rq, struct sg_io_v4 *hdr,\n" @@ -55,4 +44,4 @@ "\n" Bart. -8706ac577c2d7db1a6cf8663f01a6e36ad6fd173a7552bbc8553c602a681666f +755e86bc23316196862ce591ed4eb8337d175ddf1a7dcbe9bd12b7eedc2a89ec
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.