Message ID | 20200508161517.252308-13-hch@lst.de (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | [01/15] nfblock: use gendisk private_data | expand |
On Fri, May 8, 2020 at 9:17 AM Christoph Hellwig <hch@lst.de> wrote: > > Signed-off-by: Christoph Hellwig <hch@lst.de> Thanks for the cleanup. IIUC, you want this go through md tree? Otherwise, Acked-by: Song Liu <song@kernel.org> > --- > drivers/md/md.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/md/md.c b/drivers/md/md.c > index 271e8a5873549..c079ecf77c564 100644 > --- a/drivers/md/md.c > +++ b/drivers/md/md.c > @@ -466,7 +466,7 @@ static blk_qc_t md_make_request(struct request_queue *q, struct bio *bio) > { > const int rw = bio_data_dir(bio); > const int sgrp = op_stat_group(bio_op(bio)); > - struct mddev *mddev = q->queuedata; > + struct mddev *mddev = bio->bi_disk->private_data; > unsigned int sectors; > > if (unlikely(test_bit(MD_BROKEN, &mddev->flags)) && (rw == WRITE)) { > @@ -5626,7 +5626,6 @@ static int md_alloc(dev_t dev, char *name) > mddev->queue = blk_alloc_queue(md_make_request, NUMA_NO_NODE); > if (!mddev->queue) > goto abort; > - mddev->queue->queuedata = mddev; > > blk_set_stacking_limits(&mddev->queue->limits); > > -- > 2.26.2 >
On Wed, May 13, 2020 at 11:29:17AM -0700, Song Liu wrote: > On Fri, May 8, 2020 at 9:17 AM Christoph Hellwig <hch@lst.de> wrote: > > > > Signed-off-by: Christoph Hellwig <hch@lst.de> > > Thanks for the cleanup. IIUC, you want this go through md tree? Yes, please pick it up though the md tree.
On Wed, May 13, 2020 at 11:33 AM Christoph Hellwig <hch@lst.de> wrote: > > On Wed, May 13, 2020 at 11:29:17AM -0700, Song Liu wrote: > > On Fri, May 8, 2020 at 9:17 AM Christoph Hellwig <hch@lst.de> wrote: > > > > > > Signed-off-by: Christoph Hellwig <hch@lst.de> > > > > Thanks for the cleanup. IIUC, you want this go through md tree? > > Yes, please pick it up though the md tree. Thanks for the clarification. Applied to md-next.
diff --git a/drivers/md/md.c b/drivers/md/md.c index 271e8a5873549..c079ecf77c564 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -466,7 +466,7 @@ static blk_qc_t md_make_request(struct request_queue *q, struct bio *bio) { const int rw = bio_data_dir(bio); const int sgrp = op_stat_group(bio_op(bio)); - struct mddev *mddev = q->queuedata; + struct mddev *mddev = bio->bi_disk->private_data; unsigned int sectors; if (unlikely(test_bit(MD_BROKEN, &mddev->flags)) && (rw == WRITE)) { @@ -5626,7 +5626,6 @@ static int md_alloc(dev_t dev, char *name) mddev->queue = blk_alloc_queue(md_make_request, NUMA_NO_NODE); if (!mddev->queue) goto abort; - mddev->queue->queuedata = mddev; blk_set_stacking_limits(&mddev->queue->limits);
Signed-off-by: Christoph Hellwig <hch@lst.de> --- drivers/md/md.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)