Re: [PATCH 04/11] block: implement blk_rq_pos/[cur_]sectors() and convert obvious ones

Sergei Shtylyov
2009-05-04T13:44:23Z

Tejun Heo wrote:

> Implement accessors - blk_rq_pos(), blk_rq_sectors() and
> blk_rq_cur_sectors() which return rq->sector, rq->hard_nr_sectors and

Well, blk_rq_pos() returns rq->hard_sector, not rq->sector, doesn't it?

> rq->hard_cur_sectors respectively and convert direct references of the
> said fields to the accessors.

> This is in preparation of request data length handling cleanup.

> const added to struct request * parameter to accessors as suggested by
> Geert Uytterhoeven.

> [ Impact: cleanup ]

> Signed-off-by: Tejun Heo <tj@kernel.org>
> Acked-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
> Acked-by: Stephen Rothwell <sfr@canb.auug.org.au>
> Tested-by: Grant Likely <grant.likely@secretlab.ca>
> Acked-by: Grant Likely <grant.likely@secretlab.ca>

Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>

> diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
> index 7ab93d9..b921d91 100644
> --- a/include/linux/blkdev.h
> +++ b/include/linux/blkdev.h
> @@ -833,13 +833,30 @@ static inline void blk_run_address_space(struct address_space *mapping)
> extern void blkdev_dequeue_request(struct request *req);
>
> /*
> - * blk_end_request() takes bytes instead of sectors as a complete size.
> - * blk_rq_bytes() returns bytes left to complete in the entire request.
> - * blk_rq_cur_bytes() returns bytes left to complete in the current segment.
> + * blk_rq_pos() : the current sector
> + * blk_rq_bytes() : bytes left in the entire request
> + * blk_rq_cur_bytes() : bytes left in the current segment
> + * blk_rq_sectors() : sectors left in the entire request
> + * blk_rq_cur_sectors() : sectors left in the current segment
> */
> +static inline sector_t blk_rq_pos(const struct request *rq)
> +{
> + return rq->hard_sector;
> +}
> +

[...]

MBR, Sergei