| Message ID | 20210608230703.19510-3-bvanassche@acm.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Improve I/O priority support | expand |
On 2021/06/09 8:07, Bart Van Assche wrote: > Before adding more calls in this function, simplify the error path. > > Cc: Tejun Heo <tj@kernel.org> > Cc: Damien Le Moal <damien.lemoal@wdc.com> > Cc: Hannes Reinecke <hare@suse.de> > Cc: Christoph Hellwig <hch@lst.de> > Cc: Ming Lei <ming.lei@redhat.com> > Cc: Johannes Thumshirn <johannes.thumshirn@wdc.com> > Cc: Himanshu Madhani <himanshu.madhani@oracle.com> > Signed-off-by: Bart Van Assche <bvanassche@acm.org> > --- > block/blk-cgroup.c | 9 ++++----- > 1 file changed, 4 insertions(+), 5 deletions(-) > > diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c > index d169e2055158..3b0f6efaa2b6 100644 > --- a/block/blk-cgroup.c > +++ b/block/blk-cgroup.c > @@ -1183,15 +1183,14 @@ int blkcg_init_queue(struct request_queue *q) > if (preloaded) > radix_tree_preload_end(); > > - ret = blk_throtl_init(q); > + ret = blk_iolatency_init(q); > if (ret) > goto err_destroy_all; > > - ret = blk_iolatency_init(q); > - if (ret) { > - blk_throtl_exit(q); > + ret = blk_throtl_init(q); > + if (ret) > goto err_destroy_all; > - } > + > return 0; > > err_destroy_all: > Looks good. Reviewed-by: Damien Le Moal <damien.lemoal@wdc.com>
Looks good,
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
On 6/9/21 1:06 AM, Bart Van Assche wrote: > Before adding more calls in this function, simplify the error path. > > Cc: Tejun Heo <tj@kernel.org> > Cc: Damien Le Moal <damien.lemoal@wdc.com> > Cc: Hannes Reinecke <hare@suse.de> > Cc: Christoph Hellwig <hch@lst.de> > Cc: Ming Lei <ming.lei@redhat.com> > Cc: Johannes Thumshirn <johannes.thumshirn@wdc.com> > Cc: Himanshu Madhani <himanshu.madhani@oracle.com> > Signed-off-by: Bart Van Assche <bvanassche@acm.org> > --- > block/blk-cgroup.c | 9 ++++----- > 1 file changed, 4 insertions(+), 5 deletions(-) > > diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c > index d169e2055158..3b0f6efaa2b6 100644 > --- a/block/blk-cgroup.c > +++ b/block/blk-cgroup.c > @@ -1183,15 +1183,14 @@ int blkcg_init_queue(struct request_queue *q) > if (preloaded) > radix_tree_preload_end(); > > - ret = blk_throtl_init(q); > + ret = blk_iolatency_init(q); > if (ret) > goto err_destroy_all; > > - ret = blk_iolatency_init(q); > - if (ret) { > - blk_throtl_exit(q); > + ret = blk_throtl_init(q); > + if (ret) > goto err_destroy_all; > - } > + > return 0; > > err_destroy_all: > Reviewed-by: Hannes Reinecke <hare@suse.de> Cheers, Hannes
diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c index d169e2055158..3b0f6efaa2b6 100644 --- a/block/blk-cgroup.c +++ b/block/blk-cgroup.c @@ -1183,15 +1183,14 @@ int blkcg_init_queue(struct request_queue *q) if (preloaded) radix_tree_preload_end(); - ret = blk_throtl_init(q); + ret = blk_iolatency_init(q); if (ret) goto err_destroy_all; - ret = blk_iolatency_init(q); - if (ret) { - blk_throtl_exit(q); + ret = blk_throtl_init(q); + if (ret) goto err_destroy_all; - } + return 0; err_destroy_all:
Before adding more calls in this function, simplify the error path. Cc: Tejun Heo <tj@kernel.org> Cc: Damien Le Moal <damien.lemoal@wdc.com> Cc: Hannes Reinecke <hare@suse.de> Cc: Christoph Hellwig <hch@lst.de> Cc: Ming Lei <ming.lei@redhat.com> Cc: Johannes Thumshirn <johannes.thumshirn@wdc.com> Cc: Himanshu Madhani <himanshu.madhani@oracle.com> Signed-off-by: Bart Van Assche <bvanassche@acm.org> --- block/blk-cgroup.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)