lkml.org 
[lkml]   [2020]   [May]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 14/15] nvdimm/btt: stop using ->queuedata
    Date
    Signed-off-by: Christoph Hellwig <hch@lst.de>
    ---
    drivers/nvdimm/btt.c | 3 +--
    1 file changed, 1 insertion(+), 2 deletions(-)

    diff --git a/drivers/nvdimm/btt.c b/drivers/nvdimm/btt.c
    index 3b09419218d6f..eca3e48fefda1 100644
    --- a/drivers/nvdimm/btt.c
    +++ b/drivers/nvdimm/btt.c
    @@ -1442,7 +1442,7 @@ static int btt_do_bvec(struct btt *btt, struct bio_integrity_payload *bip,
    static blk_qc_t btt_make_request(struct request_queue *q, struct bio *bio)
    {
    struct bio_integrity_payload *bip = bio_integrity(bio);
    - struct btt *btt = q->queuedata;
    + struct btt *btt = bio->bi_disk->private_data;
    struct bvec_iter iter;
    unsigned long start;
    struct bio_vec bvec;
    @@ -1543,7 +1543,6 @@ static int btt_blk_init(struct btt *btt)
    blk_queue_logical_block_size(btt->btt_queue, btt->sector_size);
    blk_queue_max_hw_sectors(btt->btt_queue, UINT_MAX);
    blk_queue_flag_set(QUEUE_FLAG_NONROT, btt->btt_queue);
    - btt->btt_queue->queuedata = btt;

    if (btt_meta_size(btt)) {
    int rc = nd_integrity_init(btt->btt_disk, btt_meta_size(btt));
    --
    2.26.2
    \
     
     \ /
      Last update: 2020-05-08 18:17    [W:4.114 / U:0.668 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site