Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 83096ebf authored by Tejun Heo's avatar Tejun Heo Committed by Jens Axboe
Browse files

block: convert to pos and nr_sectors accessors 



With recent cleanups, there is no place where low level driver
directly manipulates request fields.  This means that the 'hard'
request fields always equal the !hard fields.  Convert all
rq->sectors, nr_sectors and current_nr_sectors references to
accessors.

While at it, drop superflous blk_rq_pos() < 0 test in swim.c.

[ Impact: use pos and nr_sectors accessors ]

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Acked-by: default avatarGeert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Tested-by: default avatarGrant Likely <grant.likely@secretlab.ca>
Acked-by: default avatarGrant Likely <grant.likely@secretlab.ca>
Tested-by: default avatarAdrian McMenamin <adrian@mcmen.demon.co.uk>
Acked-by: default avatarAdrian McMenamin <adrian@mcmen.demon.co.uk>
Acked-by: default avatarMike Miller <mike.miller@hp.com>
Cc: James Bottomley <James.Bottomley@HansenPartnership.com>
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Cc: Borislav Petkov <petkovbb@googlemail.com>
Cc: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Cc: Eric Moore <Eric.Moore@lsi.com>
Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: Pete Zaitcev <zaitcev@redhat.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Paul Clements <paul.clements@steeleye.com>
Cc: Tim Waugh <tim@cyberelk.net>
Cc: Jeff Garzik <jgarzik@pobox.com>
Cc: Jeremy Fitzhardinge <jeremy@xensource.com>
Cc: Alex Dubov <oakad@yahoo.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Dario Ballabio <ballabio_dario@emc.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: unsik Kim <donari75@gmail.com>
Cc: Laurent Vivier <Laurent@lvivier.info>
Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent 5b93629b

arch/um/drivers/ubd_kern.c

+1 −1
Original line number Diff line number Diff line
@@ -1239,7 +1239,7 @@ static void do_ubd_request(struct request_queue *q) 
		}



		req = dev->request;

		sector = req->sector;

		sector = blk_rq_pos(req);

		while(dev->start_sg < dev->end_sg){

			struct scatterlist *sg = &dev->sg[dev->start_sg];

block/as-iosched.c

+10 −8
Original line number Diff line number Diff line
@@ -306,8 +306,8 @@ as_choose_req(struct as_data *ad, struct request *rq1, struct request *rq2) 
	data_dir = rq_is_sync(rq1);



	last = ad->last_sector[data_dir];

	s1 = rq1->sector;

	s2 = rq2->sector;

	s1 = blk_rq_pos(rq1);

	s2 = blk_rq_pos(rq2);



	BUG_ON(data_dir != rq_is_sync(rq2));
@@ -566,13 +566,15 @@ static void as_update_iohist(struct as_data *ad, struct as_io_context *aic, 
			as_update_thinktime(ad, aic, thinktime);



			/* Calculate read -> read seek distance */

			if (aic->last_request_pos < rq->sector)

				seek_dist = rq->sector - aic->last_request_pos;

			if (aic->last_request_pos < blk_rq_pos(rq))

				seek_dist = blk_rq_pos(rq) -

					    aic->last_request_pos;

			else

				seek_dist = aic->last_request_pos - rq->sector;

				seek_dist = aic->last_request_pos -

					    blk_rq_pos(rq);

			as_update_seekdist(ad, aic, seek_dist);

		}

		aic->last_request_pos = rq->sector + rq->nr_sectors;

		aic->last_request_pos = blk_rq_pos(rq) + blk_rq_sectors(rq);

		set_bit(AS_TASK_IOSTARTED, &aic->state);

		spin_unlock(&aic->lock);

	}
@@ -587,7 +589,7 @@ static int as_close_req(struct as_data *ad, struct as_io_context *aic, 
{

	unsigned long delay;	/* jiffies */

	sector_t last = ad->last_sector[ad->batch_data_dir];

	sector_t next = rq->sector;

	sector_t next = blk_rq_pos(rq);

	sector_t delta; /* acceptable close offset (in sectors) */

	sector_t s;
@@ -981,7 +983,7 @@ static void as_move_to_dispatch(struct as_data *ad, struct request *rq) 
	 * This has to be set in order to be correctly updated by

	 * as_find_next_rq

	 */

	ad->last_sector[data_dir] = rq->sector + rq->nr_sectors;

	ad->last_sector[data_dir] = blk_rq_pos(rq) + blk_rq_sectors(rq);



	if (data_dir == BLK_RW_SYNC) {

		struct io_context *ioc = RQ_IOC(rq);

block/blk-barrier.c

+1 −1
Original line number Diff line number Diff line
@@ -324,7 +324,7 @@ int blkdev_issue_flush(struct block_device *bdev, sector_t *error_sector) 
	/*

	 * The driver must store the error location in ->bi_sector, if

	 * it supports it. For non-stacked drivers, this should be copied

	 * from rq->sector.

	 * from blk_rq_pos(rq).

	 */

	if (error_sector)

		*error_sector = bio->bi_sector;

block/blk-core.c

+8 −9
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ static void drive_stat_acct(struct request *rq, int new_io) 
		return;



	cpu = part_stat_lock();

	part = disk_map_sector_rcu(rq->rq_disk, rq->sector);

	part = disk_map_sector_rcu(rq->rq_disk, blk_rq_pos(rq));



	if (!new_io)

		part_stat_inc(cpu, part, merges[rw]);
@@ -185,10 +185,9 @@ void blk_dump_rq_flags(struct request *rq, char *msg) 
		rq->rq_disk ? rq->rq_disk->disk_name : "?", rq->cmd_type,

		rq->cmd_flags);



	printk(KERN_INFO "  sector %llu, nr/cnr %lu/%u\n",

						(unsigned long long)rq->sector,

						rq->nr_sectors,

						rq->current_nr_sectors);

	printk(KERN_INFO "  sector %llu, nr/cnr %u/%u\n",

	       (unsigned long long)blk_rq_pos(rq),

	       blk_rq_sectors(rq), blk_rq_cur_sectors(rq));

	printk(KERN_INFO "  bio %p, biotail %p, buffer %p, len %u\n",

						rq->bio, rq->biotail,

						rq->buffer, rq->data_len);
@@ -1557,7 +1556,7 @@ EXPORT_SYMBOL(submit_bio); 
 */

int blk_rq_check_limits(struct request_queue *q, struct request *rq)

{

	if (rq->nr_sectors > q->max_sectors ||

	if (blk_rq_sectors(rq) > q->max_sectors ||

	    rq->data_len > q->max_hw_sectors << 9) {

		printk(KERN_ERR "%s: over max size limit.\n", __func__);

		return -EIO;
@@ -1645,7 +1644,7 @@ static void blk_account_io_completion(struct request *req, unsigned int bytes) 
		int cpu;



		cpu = part_stat_lock();

		part = disk_map_sector_rcu(req->rq_disk, req->sector);

		part = disk_map_sector_rcu(req->rq_disk, blk_rq_pos(req));

		part_stat_add(cpu, part, sectors[rw], bytes >> 9);

		part_stat_unlock();

	}
@@ -1665,7 +1664,7 @@ static void blk_account_io_done(struct request *req) 
		int cpu;



		cpu = part_stat_lock();

		part = disk_map_sector_rcu(req->rq_disk, req->sector);

		part = disk_map_sector_rcu(req->rq_disk, blk_rq_pos(req));



		part_stat_inc(cpu, part, ios[rw]);

		part_stat_add(cpu, part, ticks[rw], duration);
@@ -1846,7 +1845,7 @@ bool blk_update_request(struct request *req, int error, unsigned int nr_bytes) 
	if (error && (blk_fs_request(req) && !(req->cmd_flags & REQ_QUIET))) {

		printk(KERN_ERR "end_request: I/O error, dev %s, sector %llu\n",

				req->rq_disk ? req->rq_disk->disk_name : "?",

				(unsigned long long)req->sector);

				(unsigned long long)blk_rq_pos(req));

	}



	blk_account_io_completion(req, nr_bytes);

block/blk-merge.c

+5 −5
Original line number Diff line number Diff line
@@ -259,7 +259,7 @@ int ll_back_merge_fn(struct request_queue *q, struct request *req, 
	else

		max_sectors = q->max_sectors;



	if (req->nr_sectors + bio_sectors(bio) > max_sectors) {

	if (blk_rq_sectors(req) + bio_sectors(bio) > max_sectors) {

		req->cmd_flags |= REQ_NOMERGE;

		if (req == q->last_merge)

			q->last_merge = NULL;
@@ -284,7 +284,7 @@ int ll_front_merge_fn(struct request_queue *q, struct request *req, 
		max_sectors = q->max_sectors;





	if (req->nr_sectors + bio_sectors(bio) > max_sectors) {

	if (blk_rq_sectors(req) + bio_sectors(bio) > max_sectors) {

		req->cmd_flags |= REQ_NOMERGE;

		if (req == q->last_merge)

			q->last_merge = NULL;
@@ -315,7 +315,7 @@ static int ll_merge_requests_fn(struct request_queue *q, struct request *req, 
	/*

	 * Will it become too large?

	 */

	if ((req->nr_sectors + next->nr_sectors) > q->max_sectors)

	if ((blk_rq_sectors(req) + blk_rq_sectors(next)) > q->max_sectors)

		return 0;



	total_phys_segments = req->nr_phys_segments + next->nr_phys_segments;
@@ -345,7 +345,7 @@ static void blk_account_io_merge(struct request *req) 
		int cpu;



		cpu = part_stat_lock();

		part = disk_map_sector_rcu(req->rq_disk, req->sector);

		part = disk_map_sector_rcu(req->rq_disk, blk_rq_pos(req));



		part_round_stats(cpu, part);

		part_dec_in_flight(part);
@@ -366,7 +366,7 @@ static int attempt_merge(struct request_queue *q, struct request *req, 
	/*

	 * not contiguous

	 */

	if (req->sector + req->nr_sectors != next->sector)

	if (blk_rq_pos(req) + blk_rq_sectors(req) != blk_rq_pos(next))

		return 0;



	if (rq_data_dir(req) != rq_data_dir(next)