diff for duplicates of <1488301028.2370.7.camel@sandisk.com> diff --git a/a/1.txt b/N1/1.txt index c6e49c2..c146d85 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,13 +1,13 @@ On Tue, 2017-02-28 at 19:25 +0900, Damien Le Moal wrote: > From: Bart Van Assche <bart.vanassche@sandisk.com> ->=20 +> > Use blk_rq_accesses_medium() instead of !blk_rq_is_passthrough() to > ensure that code that is intended for normal medium access requests, > e.g. DISCARD, READ and WRITE requests, is not applied to > REQ_OP_ZONE_REPORT requests nor to REQ_OP_ZONE_RESET requests. > This allows excluding these zone requests from request accounting > and from request scheduling. ->=20 +> > Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com> Hello Damien, @@ -16,40 +16,36 @@ Since you posted this patch you should have added your Signed-off-by. And since you have edited this patch, you should have documented what you have changed. -> static inline void req_set_nomerge(struct request_queue *q, struct reque= -st *req) +> static inline void req_set_nomerge(struct request_queue *q, struct request *req) > diff --git a/block/elevator.c b/block/elevator.c > index 699d10f..cbf81c6 100644 > --- a/block/elevator.c > +++ b/block/elevator.c -> @@ -635,16 +635,20 @@ void __elv_add_request(struct request_queue *q, str= -uct request *rq, int where) -> =20 -> rq->q =3D q; -> =20 +> @@ -635,16 +635,20 @@ void __elv_add_request(struct request_queue *q, struct request *rq, int where) +> +> rq->q = q; +> > - if (rq->rq_flags & RQF_SOFTBARRIER) { > + if (!blk_rq_accesses_medium(rq)) { > + /* Do not schedule zone requests */ -> + where =3D ELEVATOR_INSERT_FRONT; +> + where = ELEVATOR_INSERT_FRONT; > + } if (rq->rq_flags & RQF_SOFTBARRIER) { This change was not in the patch I sent to you. Additionally, this change -doesn't look properly formatted. Please make sure that the second "if" star= -ts +doesn't look properly formatted. Please make sure that the second "if" starts on a new line. > } > } else if (!(rq->rq_flags & RQF_ELVPRIV) && -> (where =3D=3D ELEVATOR_INSERT_SORT || -> - where =3D=3D ELEVATOR_INSERT_SORT_MERGE)) -> + where =3D=3D ELEVATOR_INSERT_SORT_MERGE)) { -> where =3D ELEVATOR_INSERT_BACK; +> (where == ELEVATOR_INSERT_SORT || +> - where == ELEVATOR_INSERT_SORT_MERGE)) +> + where == ELEVATOR_INSERT_SORT_MERGE)) { +> where = ELEVATOR_INSERT_BACK; > + } -This change wasn't in my patch either. Since this change only adds a pair o= -f +This change wasn't in my patch either. Since this change only adds a pair of braces, can it be left out? Thanks, -Bart.= +Bart. diff --git a/a/content_digest b/N1/content_digest index 7cca1b7..1d8f73d 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -15,14 +15,14 @@ "b\0" "On Tue, 2017-02-28 at 19:25 +0900, Damien Le Moal wrote:\n" "> From: Bart Van Assche <bart.vanassche@sandisk.com>\n" - ">=20\n" + "> \n" "> Use blk_rq_accesses_medium() instead of !blk_rq_is_passthrough() to\n" "> ensure that code that is intended for normal medium access requests,\n" "> e.g. DISCARD, READ and WRITE requests, is not applied to\n" "> REQ_OP_ZONE_REPORT requests nor to REQ_OP_ZONE_RESET requests.\n" "> This allows excluding these zone requests from request accounting\n" "> and from request scheduling.\n" - ">=20\n" + "> \n" "> Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com>\n" "\n" "Hello Damien,\n" @@ -31,42 +31,38 @@ "since you have edited this patch, you should have documented what you have\n" "changed.\n" "\n" - "> static inline void req_set_nomerge(struct request_queue *q, struct reque=\n" - "st *req)\n" + "> static inline void req_set_nomerge(struct request_queue *q, struct request *req)\n" "> diff --git a/block/elevator.c b/block/elevator.c\n" "> index 699d10f..cbf81c6 100644\n" "> --- a/block/elevator.c\n" "> +++ b/block/elevator.c\n" - "> @@ -635,16 +635,20 @@ void __elv_add_request(struct request_queue *q, str=\n" - "uct request *rq, int where)\n" - "> =20\n" - "> \trq->q =3D q;\n" - "> =20\n" + "> @@ -635,16 +635,20 @@ void __elv_add_request(struct request_queue *q, struct request *rq, int where)\n" + "> \n" + "> \trq->q = q;\n" + "> \n" "> -\tif (rq->rq_flags & RQF_SOFTBARRIER) {\n" "> +\tif (!blk_rq_accesses_medium(rq)) {\n" "> +\t\t/* Do not schedule zone requests */\n" - "> +\t\twhere =3D ELEVATOR_INSERT_FRONT;\n" + "> +\t\twhere = ELEVATOR_INSERT_FRONT;\n" "> +\t} if (rq->rq_flags & RQF_SOFTBARRIER) {\n" "\n" "This change was not in the patch I sent to you. Additionally, this change\n" - "doesn't look properly formatted. Please make sure that the second \"if\" star=\n" - "ts\n" + "doesn't look properly formatted. Please make sure that the second \"if\" starts\n" "on a new line.\n" "\n" "> \t\t}\n" "> \t} else if (!(rq->rq_flags & RQF_ELVPRIV) &&\n" - "> \t\t (where =3D=3D ELEVATOR_INSERT_SORT ||\n" - "> -\t\t where =3D=3D ELEVATOR_INSERT_SORT_MERGE))\n" - "> +\t\t where =3D=3D ELEVATOR_INSERT_SORT_MERGE)) {\n" - "> \t\twhere =3D ELEVATOR_INSERT_BACK;\n" + "> \t\t (where == ELEVATOR_INSERT_SORT ||\n" + "> -\t\t where == ELEVATOR_INSERT_SORT_MERGE))\n" + "> +\t\t where == ELEVATOR_INSERT_SORT_MERGE)) {\n" + "> \t\twhere = ELEVATOR_INSERT_BACK;\n" "> +\t}\n" "\n" - "This change wasn't in my patch either. Since this change only adds a pair o=\n" - "f\n" + "This change wasn't in my patch either. Since this change only adds a pair of\n" "braces, can it be left out?\n" "\n" "Thanks,\n" "\n" - Bart.= + Bart. -95d9d7a9b65fd7018b873291f125a900a368eade36dfae2b6c370ff10c328387 +37f7e29aacac99356872f40377909bfba29436f4340637840ec0befb503295d3
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.