diff for duplicates of <1495641879.2823.7.camel@sandisk.com> diff --git a/a/1.txt b/N1/1.txt index f06f602..b3cc5fa 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,23 +1,25 @@ On Thu, 2017-05-18 at 15:17 +0200, Christoph Hellwig wrote: > We will only have sense data if the command exectured and got a SCSI > result, so this is pointless. -> +>=20 > Signed-off-by: Christoph Hellwig <hch@lst.de> > --- > drivers/scsi/osd/osd_initiator.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) -> -> diff --git a/drivers/scsi/osd/osd_initiator.c b/drivers/scsi/osd/osd_initiator.c +>=20 +> diff --git a/drivers/scsi/osd/osd_initiator.c b/drivers/scsi/osd/osd_init= +iator.c > index 8a1b94816419..14785177ce7b 100644 > --- a/drivers/scsi/osd/osd_initiator.c > +++ b/drivers/scsi/osd/osd_initiator.c -> @@ -477,7 +477,7 @@ static void _set_error_resid(struct osd_request *or, struct request *req, +> @@ -477,7 +477,7 @@ static void _set_error_resid(struct osd_request *or, = +struct request *req, > int error) > { -> or->async_error = error; -> - or->req_errors = scsi_req(req)->result ? : error; -> + or->req_errors = scsi_req(req)->result; -> or->sense_len = scsi_req(req)->sense_len; +> or->async_error =3D error; +> - or->req_errors =3D scsi_req(req)->result ? : error; +> + or->req_errors =3D scsi_req(req)->result; +> or->sense_len =3D scsi_req(req)->sense_len; > if (or->sense_len) > memcpy(or->sense, scsi_req(req)->sense, or->sense_len); @@ -31,7 +33,7 @@ static void _put_request(struct request *rq) * If osd_finalize_request() was called but the request was not * executed through the block layer, then we must release BIOs. * TODO: Keep error code in or->async_error. Need to audit all - * code paths. + *=A0=A0=A0=A0=A0=A0=A0code paths. */ if (unlikely(rq->bio)) blk_end_request(rq, -ENOMEM, blk_rq_bytes(rq)); @@ -39,4 +41,4 @@ static void _put_request(struct request *rq) blk_put_request(rq); } -Bart. +Bart.= diff --git a/a/content_digest b/N1/content_digest index efe61fa..fe5ac98 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -13,23 +13,25 @@ "On Thu, 2017-05-18 at 15:17 +0200, Christoph Hellwig wrote:\n" "> We will only have sense data if the command exectured and got a SCSI\n" "> result, so this is pointless.\n" - "> \n" + ">=20\n" "> Signed-off-by: Christoph Hellwig <hch@lst.de>\n" "> ---\n" "> drivers/scsi/osd/osd_initiator.c | 2 +-\n" "> 1 file changed, 1 insertion(+), 1 deletion(-)\n" - "> \n" - "> diff --git a/drivers/scsi/osd/osd_initiator.c b/drivers/scsi/osd/osd_initiator.c\n" + ">=20\n" + "> diff --git a/drivers/scsi/osd/osd_initiator.c b/drivers/scsi/osd/osd_init=\n" + "iator.c\n" "> index 8a1b94816419..14785177ce7b 100644\n" "> --- a/drivers/scsi/osd/osd_initiator.c\n" "> +++ b/drivers/scsi/osd/osd_initiator.c\n" - "> @@ -477,7 +477,7 @@ static void _set_error_resid(struct osd_request *or, struct request *req,\n" + "> @@ -477,7 +477,7 @@ static void _set_error_resid(struct osd_request *or, =\n" + "struct request *req,\n" "> \t\t\t int error)\n" "> {\n" - "> \tor->async_error = error;\n" - "> -\tor->req_errors = scsi_req(req)->result ? : error;\n" - "> +\tor->req_errors = scsi_req(req)->result;\n" - "> \tor->sense_len = scsi_req(req)->sense_len;\n" + "> \tor->async_error =3D error;\n" + "> -\tor->req_errors =3D scsi_req(req)->result ? : error;\n" + "> +\tor->req_errors =3D scsi_req(req)->result;\n" + "> \tor->sense_len =3D scsi_req(req)->sense_len;\n" "> \tif (or->sense_len)\n" "> \t\tmemcpy(or->sense, scsi_req(req)->sense, or->sense_len);\n" "\n" @@ -43,7 +45,7 @@ "\t * If osd_finalize_request() was called but the request was not\n" "\t * executed through the block layer, then we must release BIOs.\n" "\t * TODO: Keep error code in or->async_error. Need to audit all\n" - "\t *\302\240\302\240\302\240\302\240\302\240\302\240\302\240code paths.\n" + "\t *=A0=A0=A0=A0=A0=A0=A0code paths.\n" "\t */\n" "\tif (unlikely(rq->bio))\n" "\t\tblk_end_request(rq, -ENOMEM, blk_rq_bytes(rq));\n" @@ -51,6 +53,6 @@ "\t\tblk_put_request(rq);\n" "}\n" "\n" - Bart. + Bart.= -391754e51a98e6e68848ac03286a402c14e5acec9899517581ffe68fe4144c66 +6109b93ea881331aac886a90d4de2bc115251c267cce6becf169f15f2dc3b434
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.