block: blk_rq_[cur_]_{sectors|bytes}() usage cleanup

With the previous changes, the followings are now guaranteed for all requests in any valid state. * blk_rq_sectors() == blk_rq_bytes() >> 9 * blk_rq_cur_sectors() == blk_rq_cur_bytes() >> 9 Clean up accessor usages. Notable changes are * nbd,i2o_block: end_all used instead of explicit byte count * scsi_lib: unnecessary conditional on request type removed [ Impact: cleanup ] Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Paul Clements <paul.clements@steeleye.com> Cc: Pete Zaitcev <zaitcev@redhat.com> Cc: Alex Dubov <oakad@yahoo.com> Cc: Markus Lidel <Markus.Lidel@shadowconnect.com> Cc: David Woodhouse <dwmw2@infradead.org> Cc: James Bottomley <James.Bottomley@HansenPartnership.com> Cc: Boaz Harrosh <bharrosh@panasas.com> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

block: blk_rq_[cur_]_{sectors|bytes}() usage cleanup
With the previous changes, the followings are now guaranteed for all requests in any valid state. * blk_rq_sectors() == blk_rq_bytes() >> 9 * blk_rq_cur_sectors() == blk_rq_cur_bytes() >> 9 Clean up accessor usages. Notable changes are * nbd,i2o_block: end_all used instead of explicit byte count * scsi_lib: unnecessary conditional on request type removed [ Impact: cleanup ] Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Paul Clements <paul.clements@steeleye.com> Cc: Pete Zaitcev <zaitcev@redhat.com> Cc: Alex Dubov <oakad@yahoo.com> Cc: Markus Lidel <Markus.Lidel@shadowconnect.com> Cc: David Woodhouse <dwmw2@infradead.org> Cc: James Bottomley <James.Bottomley@HansenPartnership.com> Cc: Boaz Harrosh <bharrosh@panasas.com> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Tejun Heo · Jens Axboe
1 parent a2dec7b363
Showing 9 changed files with 18 additions and 30 deletions Side-by-side Diff
drivers/block/floppy.c
drivers/block/nbd.c
drivers/block/ub.c
drivers/block/z2ram.c
drivers/memstick/core/mspro_block.c
drivers/message/i2o/i2o_block.c
drivers/mtd/mtd_blkdevs.c
drivers/sbus/char/jsflash.c
drivers/scsi/scsi_lib.c
@@ -2512,8 +2512,7 @@
  
 	remaining = current_count_sectors << 9;
 #ifdef FLOPPY_SANITY_CHECK
-	if ((remaining >> 9) > blk_rq_sectors(current_req) &&
-	    CT(COMMAND) == FD_WRITE) {
+	if (remaining > blk_rq_bytes(current_req) && CT(COMMAND) == FD_WRITE) {
 		DPRINT("in copy buffer\n");
 		printk("current_count_sectors=%ld\n", current_count_sectors);
 		printk("remaining=%d\n", remaining >> 9);
@@ -2530,7 +2529,7 @@
  
 	dma_buffer = floppy_track_buffer + ((fsector_t - buffer_min) << 9);
  
-	size = blk_rq_cur_sectors(current_req) << 9;
+	size = blk_rq_cur_bytes(current_req);
  
 	rq_for_each_segment(bv, current_req, iter) {
 		if (!remaining)
@@ -2879,7 +2878,7 @@
 				printk("write\n");
 			return 0;
 		}
-	} else if (raw_cmd->length > blk_rq_sectors(current_req) << 9 ||
+	} else if (raw_cmd->length > blk_rq_bytes(current_req) ||
 		   current_count_sectors > blk_rq_sectors(current_req)) {
 		DPRINT("buffer overrun in direct transfer\n");
 		return 0;
@@ -110,7 +110,7 @@
 			req, error ? "failed" : "done");
  
 	spin_lock_irqsave(q->queue_lock, flags);
-	__blk_end_request(req, error, blk_rq_sectors(req) << 9);
+	__blk_end_request_all(req, error);
 	spin_unlock_irqrestore(q->queue_lock, flags);
 }
  
@@ -231,7 +231,7 @@
 {
 	int result, flags;
 	struct nbd_request request;
-	unsigned long size = blk_rq_sectors(req) << 9;
+	unsigned long size = blk_rq_bytes(req);
  
 	request.magic = htonl(NBD_REQUEST_MAGIC);
 	request.type = htonl(nbd_cmd(req));
@@ -243,7 +243,7 @@
 			lo->disk->disk_name, req,
 			nbdcmd_to_ascii(nbd_cmd(req)),
 			(unsigned long long)blk_rq_pos(req) << 9,
-			blk_rq_sectors(req) << 9);
+			blk_rq_bytes(req));
 	result = sock_xmit(lo, 1, &request, sizeof(request),
 			(nbd_cmd(req) == NBD_CMD_WRITE) ? MSG_MORE : 0);
 	if (result <= 0) {
@@ -739,7 +739,7 @@
 	cmd->cdb[8] = nblks;
 	cmd->cdb_len = 10;
  
-	cmd->len = blk_rq_sectors(rq) * 512;
+	cmd->len = blk_rq_bytes(rq);
 }
  
 static void ub_cmd_build_packet(struct ub_dev *sc, struct ub_lun *lun,
@@ -72,7 +72,7 @@
 	struct request *req;
 	while ((req = elv_next_request(q)) != NULL) {
 		unsigned long start = blk_rq_pos(req) << 9;
-		unsigned long len  = blk_rq_cur_sectors(req) << 9;
+		unsigned long len  = blk_rq_cur_bytes(req);
  
 		if (start + len > z2ram_size) {
 			printk( KERN_ERR DEVICE_NAME ": bad access: block=%lu, count=%u\n",
@@ -680,7 +680,7 @@
 		t_sec = blk_rq_pos(msb->block_req) << 9;
 		sector_div(t_sec, msb->page_size);
  
-		count = blk_rq_sectors(msb->block_req) << 9;
+		count = blk_rq_bytes(msb->block_req);
 		count /= msb->page_size;
  
 		param.system = msb->system;
@@ -745,7 +745,7 @@
 					t_len *= msb->page_size;
 			}
 		} else
-			t_len = blk_rq_sectors(msb->block_req) << 9;
+			t_len = blk_rq_bytes(msb->block_req);
  
 		dev_dbg(&card->dev, "transferred %x (%d)\n", t_len, error);
  
@@ -426,15 +426,9 @@
 	struct request_queue *q = req->q;
 	unsigned long flags;
  
-	if (blk_end_request(req, error, nr_bytes)) {
-		int leftover = (blk_rq_sectors(req) << KERNEL_SECTOR_SHIFT);
-
-		if (blk_pc_request(req))
-			leftover = blk_rq_bytes(req);
-
+	if (blk_end_request(req, error, nr_bytes))
 		if (error)
-			blk_end_request(req, -EIO, leftover);
-	}
+			blk_end_request_all(req, -EIO);
  
 	spin_lock_irqsave(q->queue_lock, flags);
  
  
@@ -832,15 +826,13 @@
  
 		memcpy(mptr, cmd, 10);
 		mptr += 4;
-		*mptr++ =
-		    cpu_to_le32(blk_rq_sectors(req) << KERNEL_SECTOR_SHIFT);
+		*mptr++ = cpu_to_le32(blk_rq_bytes(req));
 	} else
 #endif
 	{
 		msg->u.head[1] = cpu_to_le32(cmd | HOST_TID << 12 | tid);
 		*mptr++ = cpu_to_le32(ctl_flags);
-		*mptr++ =
-		    cpu_to_le32(blk_rq_sectors(req) << KERNEL_SECTOR_SHIFT);
+		*mptr++ = cpu_to_le32(blk_rq_bytes(req));
 		*mptr++ =
 		    cpu_to_le32((u32) (blk_rq_pos(req) << KERNEL_SECTOR_SHIFT));
 		*mptr++ =
@@ -48,7 +48,7 @@
 	char *buf;
  
 	block = blk_rq_pos(req) << 9 >> tr->blkshift;
-	nsect = blk_rq_cur_sectors(req) << 9 >> tr->blkshift;
+	nsect = blk_rq_cur_bytes(req) >> tr->blkshift;
  
 	buf = req->buffer;
  
@@ -189,7 +189,7 @@
 	while ((req = elv_next_request(q)) != NULL) {
 		struct jsfd_part *jdp = req->rq_disk->private_data;
 		unsigned long offset = blk_rq_pos(req) << 9;
-		size_t len = blk_rq_cur_sectors(req) << 9;
+		size_t len = blk_rq_cur_bytes(req);
  
 		if ((offset + len) > jdp->dsize) {
 			__blk_end_request_cur(req, -EIO);
@@ -546,7 +546,7 @@
 	 * to queue the remainder of them.
 	 */
 	if (blk_end_request(req, error, bytes)) {
-		int leftover = blk_rq_sectors(req) << 9;
+		int leftover = blk_rq_bytes(req);
  
 		if (blk_pc_request(req))
 			leftover = req->resid_len;
@@ -964,10 +964,7 @@
 	count = blk_rq_map_sg(req->q, req, sdb->table.sgl);
 	BUG_ON(count > sdb->table.nents);
 	sdb->table.nents = count;
-	if (blk_pc_request(req))
-		sdb->length = blk_rq_bytes(req);
-	else
-		sdb->length = blk_rq_sectors(req) << 9;
+	sdb->length = blk_rq_bytes(req);
 	return BLKPREP_OK;
 }
...	...	@@ -2512,8 +2512,7 @@
2512	2512
2513	2513	remaining = current_count_sectors << 9;
2514	2514	#ifdef FLOPPY_SANITY_CHECK
2515		- if ((remaining >> 9) > blk_rq_sectors(current_req) &&
2516		- CT(COMMAND) == FD_WRITE) {
	2515	+ if (remaining > blk_rq_bytes(current_req) && CT(COMMAND) == FD_WRITE) {
2517	2516	DPRINT("in copy buffer\n");
2518	2517	printk("current_count_sectors=%ld\n", current_count_sectors);
2519	2518	printk("remaining=%d\n", remaining >> 9);
...	...	@@ -2530,7 +2529,7 @@
2530	2529
2531	2530	dma_buffer = floppy_track_buffer + ((fsector_t - buffer_min) << 9);
2532	2531
2533		- size = blk_rq_cur_sectors(current_req) << 9;
	2532	+ size = blk_rq_cur_bytes(current_req);
2534	2533
2535	2534	rq_for_each_segment(bv, current_req, iter) {
2536	2535	if (!remaining)
...	...	@@ -2879,7 +2878,7 @@
2879	2878	printk("write\n");
2880	2879	return 0;
2881	2880	}
2882		- } else if (raw_cmd->length > blk_rq_sectors(current_req) << 9 \|\|
	2881	+ } else if (raw_cmd->length > blk_rq_bytes(current_req) \|\|
2883	2882	current_count_sectors > blk_rq_sectors(current_req)) {
2884	2883	DPRINT("buffer overrun in direct transfer\n");
2885	2884	return 0;
...	...	@@ -110,7 +110,7 @@
110	110	req, error ? "failed" : "done");
111	111
112	112	spin_lock_irqsave(q->queue_lock, flags);
113		- __blk_end_request(req, error, blk_rq_sectors(req) << 9);
	113	+ __blk_end_request_all(req, error);
114	114	spin_unlock_irqrestore(q->queue_lock, flags);
115	115	}
116	116
...	...	@@ -231,7 +231,7 @@
231	231	{
232	232	int result, flags;
233	233	struct nbd_request request;
234		- unsigned long size = blk_rq_sectors(req) << 9;
	234	+ unsigned long size = blk_rq_bytes(req);
235	235
236	236	request.magic = htonl(NBD_REQUEST_MAGIC);
237	237	request.type = htonl(nbd_cmd(req));
...	...	@@ -243,7 +243,7 @@
243	243	lo->disk->disk_name, req,
244	244	nbdcmd_to_ascii(nbd_cmd(req)),
245	245	(unsigned long long)blk_rq_pos(req) << 9,
246		- blk_rq_sectors(req) << 9);
	246	+ blk_rq_bytes(req));
247	247	result = sock_xmit(lo, 1, &request, sizeof(request),
248	248	(nbd_cmd(req) == NBD_CMD_WRITE) ? MSG_MORE : 0);
249	249	if (result <= 0) {
...	...	@@ -739,7 +739,7 @@
739	739	cmd->cdb[8] = nblks;
740	740	cmd->cdb_len = 10;
741	741
742		- cmd->len = blk_rq_sectors(rq) * 512;
	742	+ cmd->len = blk_rq_bytes(rq);
743	743	}
744	744
745	745	static void ub_cmd_build_packet(struct ub_dev sc, struct ub_lun lun,
...	...	@@ -72,7 +72,7 @@
72	72	struct request *req;
73	73	while ((req = elv_next_request(q)) != NULL) {
74	74	unsigned long start = blk_rq_pos(req) << 9;
75		- unsigned long len = blk_rq_cur_sectors(req) << 9;
	75	+ unsigned long len = blk_rq_cur_bytes(req);
76	76
77	77	if (start + len > z2ram_size) {
78	78	printk( KERN_ERR DEVICE_NAME ": bad access: block=%lu, count=%u\n",
...	...	@@ -680,7 +680,7 @@
680	680	t_sec = blk_rq_pos(msb->block_req) << 9;
681	681	sector_div(t_sec, msb->page_size);
682	682
683		- count = blk_rq_sectors(msb->block_req) << 9;
	683	+ count = blk_rq_bytes(msb->block_req);
684	684	count /= msb->page_size;
685	685
686	686	param.system = msb->system;
...	...	@@ -745,7 +745,7 @@
745	745	t_len *= msb->page_size;
746	746	}
747	747	} else
748		- t_len = blk_rq_sectors(msb->block_req) << 9;
	748	+ t_len = blk_rq_bytes(msb->block_req);
749	749
750	750	dev_dbg(&card->dev, "transferred %x (%d)\n", t_len, error);
751	751
...	...	@@ -426,15 +426,9 @@
426	426	struct request_queue *q = req->q;
427	427	unsigned long flags;
428	428
429		- if (blk_end_request(req, error, nr_bytes)) {
430		- int leftover = (blk_rq_sectors(req) << KERNEL_SECTOR_SHIFT);
431		-
432		- if (blk_pc_request(req))
433		- leftover = blk_rq_bytes(req);
434		-
	429	+ if (blk_end_request(req, error, nr_bytes))
435	430	if (error)
436		- blk_end_request(req, -EIO, leftover);
437		- }
	431	+ blk_end_request_all(req, -EIO);
438	432
439	433	spin_lock_irqsave(q->queue_lock, flags);
440	434
441	435
...	...	@@ -832,15 +826,13 @@
832	826
833	827	memcpy(mptr, cmd, 10);
834	828	mptr += 4;
835		- *mptr++ =
836		- cpu_to_le32(blk_rq_sectors(req) << KERNEL_SECTOR_SHIFT);
	829	+ *mptr++ = cpu_to_le32(blk_rq_bytes(req));
837	830	} else
838	831	#endif
839	832	{
840	833	msg->u.head[1] = cpu_to_le32(cmd \| HOST_TID << 12 \| tid);
841	834	*mptr++ = cpu_to_le32(ctl_flags);
842		- *mptr++ =
843		- cpu_to_le32(blk_rq_sectors(req) << KERNEL_SECTOR_SHIFT);
	835	+ *mptr++ = cpu_to_le32(blk_rq_bytes(req));
844	836	*mptr++ =
845	837	cpu_to_le32((u32) (blk_rq_pos(req) << KERNEL_SECTOR_SHIFT));
846	838	*mptr++ =
...	...	@@ -48,7 +48,7 @@
48	48	char *buf;
49	49
50	50	block = blk_rq_pos(req) << 9 >> tr->blkshift;
51		- nsect = blk_rq_cur_sectors(req) << 9 >> tr->blkshift;
	51	+ nsect = blk_rq_cur_bytes(req) >> tr->blkshift;
52	52
53	53	buf = req->buffer;
54	54
...	...	@@ -189,7 +189,7 @@
189	189	while ((req = elv_next_request(q)) != NULL) {
190	190	struct jsfd_part *jdp = req->rq_disk->private_data;
191	191	unsigned long offset = blk_rq_pos(req) << 9;
192		- size_t len = blk_rq_cur_sectors(req) << 9;
	192	+ size_t len = blk_rq_cur_bytes(req);
193	193
194	194	if ((offset + len) > jdp->dsize) {
195	195	__blk_end_request_cur(req, -EIO);
...	...	@@ -546,7 +546,7 @@
546	546	* to queue the remainder of them.
547	547	*/
548	548	if (blk_end_request(req, error, bytes)) {
549		- int leftover = blk_rq_sectors(req) << 9;
	549	+ int leftover = blk_rq_bytes(req);
550	550
551	551	if (blk_pc_request(req))
552	552	leftover = req->resid_len;
...	...	@@ -964,10 +964,7 @@
964	964	count = blk_rq_map_sg(req->q, req, sdb->table.sgl);
965	965	BUG_ON(count > sdb->table.nents);
966	966	sdb->table.nents = count;
967		- if (blk_pc_request(req))
968		- sdb->length = blk_rq_bytes(req);
969		- else
970		- sdb->length = blk_rq_sectors(req) << 9;
	967	+ sdb->length = blk_rq_bytes(req);
971	968	return BLKPREP_OK;
972	969	}
973	970