From 57f7c5ce8505853ee4ff3769cb94701be76458c4 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Wed, 19 Apr 2023 15:51:38 -0700 Subject: [PATCH] ANDROID: block: Rename blk_rq_is_seq_zone_write() Rename this function to align the function name with the function name used in the upstream Linux kernel. Bug: 275581839 Change-Id: I085ffacf535e65d8afbb9935a2cca26c4fec0d80 Signed-off-by: Bart Van Assche --- block/blk-zoned.c | 2 +- drivers/scsi/sd.c | 2 +- include/linux/blkdev.h | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/block/blk-zoned.c b/block/blk-zoned.c index 534863a23154..14a5d9949868 100644 --- a/block/blk-zoned.c +++ b/block/blk-zoned.c @@ -57,7 +57,7 @@ EXPORT_SYMBOL_GPL(blk_zone_cond_str); */ bool blk_req_needs_zone_write_lock(struct request *rq) { - return rq->q->seq_zones_wlock && blk_rq_is_seq_zone_write(rq); + return rq->q->seq_zones_wlock && blk_rq_is_seq_zoned_write(rq); } EXPORT_SYMBOL_GPL(blk_req_needs_zone_write_lock); diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index 67c5d45ba78e..4588823a1aee 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -1305,7 +1305,7 @@ static blk_status_t sd_setup_read_write_cmnd(struct scsi_cmnd *cmd) cmd->underflow = nr_blocks << 9; cmd->allowed = sdkp->max_retries; if (blk_queue_pipeline_zoned_writes(rq->q) && - blk_rq_is_seq_zone_write(rq)) + blk_rq_is_seq_zoned_write(rq)) cmd->allowed += rq->q->nr_requests; cmd->sdb.length = nr_blocks * sdp->sector_size; diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 3fd1e6f65a64..e7b297babfd0 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -1031,13 +1031,13 @@ static inline unsigned int blk_rq_zone_is_seq(struct request *rq) } /** - * blk_rq_is_seq_zone_write() - Whether @rq is a write request for a sequential zone. + * blk_rq_is_seq_zoned_write() - Whether @rq needs write serialization. * @rq: Request to examine. * * In this context sequential zone means either a sequential write required or * to a sequential write preferred zone. */ -static inline bool blk_rq_is_seq_zone_write(struct request *rq) +static inline bool blk_rq_is_seq_zoned_write(struct request *rq) { switch (req_op(rq)) { case REQ_OP_WRITE_ZEROES: @@ -1049,7 +1049,7 @@ static inline bool blk_rq_is_seq_zone_write(struct request *rq) } } #else /* CONFIG_BLK_DEV_ZONED */ -static inline bool blk_rq_is_seq_zone_write(struct request *rq) +static inline bool blk_rq_is_seq_zoned_write(struct request *rq) { return false; }