block: remove the write_hint field from struct request

The write_hint is only used for read/write requests, which must have a
bio attached to them.  Just use the bio field instead.

Signed-off-by: Christoph Hellwig <hch@lst.de>

diff --git a/block/blk-merge.c b/block/blk-merge.c
index d813d799cee72caa0755fec696f10b252efe91ac..c51aa56ce1f0b4890695c2c462daa92afad60cce 100644 (file)
--- a/block/blk-merge.c
+++ b/block/blk-merge.c
@@ -844,9 +844,11 @@ static struct request *attempt_merge(struct request_queue *q,
        if (rq_data_dir(req) != rq_data_dir(next))
                return NULL;
 
-       /* Don't merge requests with different write hints. */
-       if (req->write_hint != next->write_hint)
-               return NULL;
+       if (req->bio && next->bio) {
+               /* Don't merge requests with different write hints. */
+               if (req->bio->bi_write_hint != next->bio->bi_write_hint)
+                       return NULL;
+       }
 
        if (req->ioprio != next->ioprio)
                return NULL;
@@ -978,9 +980,11 @@ bool blk_rq_merge_ok(struct request *rq, struct bio *bio)
        if (!bio_crypt_rq_ctx_compatible(rq, bio))
                return false;
 
-       /* Don't merge requests with different write hints. */
-       if (rq->write_hint != bio->bi_write_hint)
-               return false;
+       if (rq->bio) {
+               /* Don't merge requests with different write hints. */
+               if (rq->bio->bi_write_hint != bio->bi_write_hint)
+                       return false;
+       }
 
        if (rq->ioprio != bio_prio(bio))
                return false;

diff --git a/block/blk-mq.c b/block/blk-mq.c
index 5e240a4b6be00ea67a803bdcecdf87d43bb5c7e7..65e6b86d341c53fac949ee952350894565bae1a6 100644 (file)
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -2660,7 +2660,6 @@ static void blk_mq_bio_to_request(struct request *rq, struct bio *bio,
                rq->cmd_flags |= REQ_FAILFAST_MASK;
 
        rq->__sector = bio->bi_iter.bi_sector;
-       rq->write_hint = bio->bi_write_hint;
        blk_rq_bio_prep(rq, bio, nr_segs);
        if (bio_integrity(bio))
                rq->nr_integrity_segments = blk_rq_count_integrity_sg(rq->q,
@@ -3308,7 +3307,6 @@ int blk_rq_prep_clone(struct request *rq, struct request *rq_src,
        }
        rq->nr_phys_segments = rq_src->nr_phys_segments;
        rq->ioprio = rq_src->ioprio;
-       rq->write_hint = rq_src->write_hint;
 
        if (rq->bio && blk_crypto_rq_bio_prep(rq, rq->bio, gfp_mask) < 0)
                goto free_and_out;

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index ca4bc0ac76adcfa8a883df8f4259ba755d3b6413..8947dab132d789005c9f5e9a3c11d59350890de8 100644 (file)
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -1190,8 +1190,8 @@ static u8 sd_group_number(struct scsi_cmnd *cmd)
        if (!sdkp->rscs)
                return 0;
 
-       return min3((u32)rq->write_hint, (u32)sdkp->permanent_stream_count,
-                   0x3fu);
+       return min3((u32)rq->bio->bi_write_hint,
+                   (u32)sdkp->permanent_stream_count, 0x3fu);
 }
 
 static blk_status_t sd_setup_rw32_cmnd(struct scsi_cmnd *cmd, bool write,
@@ -1389,7 +1389,7 @@ static blk_status_t sd_setup_read_write_cmnd(struct scsi_cmnd *cmd)
                ret = sd_setup_rw16_cmnd(cmd, write, lba, nr_blocks,
                                         protect | fua, dld);
        } else if ((nr_blocks > 0xff) || (lba > 0x1fffff) ||
-                  sdp->use_10_for_rw || protect || rq->write_hint) {
+                  sdp->use_10_for_rw || protect || rq->bio->bi_write_hint) {
                ret = sd_setup_rw10_cmnd(cmd, write, lba, nr_blocks,
                                         protect | fua);
        } else {

diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h
index 2035fad3131fb60781957095ce8a3a941dd104be..2804fe181d9ddecb47309776eb6f6ee33af7b4cb 100644 (file)
--- a/include/linux/blk-mq.h
+++ b/include/linux/blk-mq.h
@@ -156,7 +156,6 @@ struct request {
        struct blk_crypto_keyslot *crypt_keyslot;
 #endif
 
-       enum rw_hint write_hint;
        unsigned short ioprio;
 
        enum mq_rq_state state;