diff for duplicates of <1492636063.2543.18.camel@sandisk.com> diff --git a/a/1.txt b/N1/1.txt index 62824d1..b15b12b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,15 +1,16 @@ On Wed, 2017-04-19 at 21:26 +0200, Christoph Hellwig wrote: > --- a/drivers/scsi/osd/osd_initiator.c > +++ b/drivers/scsi/osd/osd_initiator.c -> @@ -489,7 +489,10 @@ static void _set_error_resid(struct osd_request *or, struct request *req, -> +> @@ -489,7 +489,10 @@ static void _set_error_resid(struct osd_request *or,= + struct request *req, +> =20 > int osd_execute_request(struct osd_request *or) > { -> - int error = blk_execute_rq(or->request->q, NULL, or->request, 0); +> - int error =3D blk_execute_rq(or->request->q, NULL, or->request, 0); > + int error; > + > + blk_execute_rq(or->request->q, NULL, or->request, 0); -> + error = or->request ? -EIO : 0; +> + error =3D or->request ? -EIO : 0; Hello Christoph, @@ -17,4 +18,4 @@ Did you perhaps intend or->request->errors instead of or->request? Otherwise this patch looks fine to me. -Bart. +Bart.= diff --git a/a/content_digest b/N1/content_digest index 6717bdc..10abb6e 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -18,15 +18,16 @@ "On Wed, 2017-04-19 at 21:26 +0200, Christoph Hellwig wrote:\n" "> --- a/drivers/scsi/osd/osd_initiator.c\n" "> +++ b/drivers/scsi/osd/osd_initiator.c\n" - "> @@ -489,7 +489,10 @@ static void _set_error_resid(struct osd_request *or, struct request *req,\n" - "> \n" + "> @@ -489,7 +489,10 @@ static void _set_error_resid(struct osd_request *or,=\n" + " struct request *req,\n" + "> =20\n" "> int osd_execute_request(struct osd_request *or)\n" "> {\n" - "> -\tint error = blk_execute_rq(or->request->q, NULL, or->request, 0);\n" + "> -\tint error =3D blk_execute_rq(or->request->q, NULL, or->request, 0);\n" "> +\tint error;\n" "> +\n" "> +\tblk_execute_rq(or->request->q, NULL, or->request, 0);\n" - "> +\terror = or->request ? -EIO : 0;\n" + "> +\terror =3D or->request ? -EIO : 0;\n" "\n" "Hello Christoph,\n" "\n" @@ -34,6 +35,6 @@ "\n" "Otherwise this patch looks fine to me.\n" "\n" - Bart. + Bart.= -98b5aa24fd243fc87cb39fea16fb45ce4a19a967b0c239da88e43ec54d56106d +700c2043f1bc81ceb3e9fc1651e989c29541a4e8f72359ad34052c7274445894
diff --git a/a/1.txt b/N2/1.txt index 62824d1..164d369 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,4 +1,4 @@ -On Wed, 2017-04-19 at 21:26 +0200, Christoph Hellwig wrote: +On Wed, 2017-04-19@21:26 +0200, Christoph Hellwig wrote: > --- a/drivers/scsi/osd/osd_initiator.c > +++ b/drivers/scsi/osd/osd_initiator.c > @@ -489,7 +489,10 @@ static void _set_error_resid(struct osd_request *or, struct request *req, diff --git a/a/content_digest b/N2/content_digest index 6717bdc..9303967 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,21 +1,11 @@ "ref\020170419192708.22098-1-hch@lst.de\0" "ref\020170419192708.22098-3-hch@lst.de\0" - "From\0Bart Van Assche <Bart.VanAssche@sandisk.com>\0" - "Subject\0Re: [PATCH 02/23] block: remove the blk_execute_rq return value\0" + "From\0Bart.VanAssche@sandisk.com (Bart Van Assche)\0" + "Subject\0[PATCH 02/23] block: remove the blk_execute_rq return value\0" "Date\0Wed, 19 Apr 2017 21:07:45 +0000\0" - "To\0hch@lst.de <hch@lst.de>" - " axboe@kernel.dk <axboe@kernel.dk>\0" - "Cc\0linux-block@vger.kernel.org <linux-block@vger.kernel.org>" - 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 Wed, 2017-04-19 at 21:26 +0200, Christoph Hellwig wrote:\n" + "On Wed, 2017-04-19@21:26 +0200, Christoph Hellwig wrote:\n" "> --- a/drivers/scsi/osd/osd_initiator.c\n" "> +++ b/drivers/scsi/osd/osd_initiator.c\n" "> @@ -489,7 +489,10 @@ static void _set_error_resid(struct osd_request *or, struct request *req,\n" @@ -36,4 +26,4 @@ "\n" Bart. -98b5aa24fd243fc87cb39fea16fb45ce4a19a967b0c239da88e43ec54d56106d +b54db2c02f539bff4dcb12a4526a607a224bb0ced1894dca802f683982dd85b1
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.