mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 18:51:56 -04:00
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 <[email protected]> Cc: Paul Clements <[email protected]> Cc: Pete Zaitcev <[email protected]> Cc: Alex Dubov <[email protected]> Cc: Markus Lidel <[email protected]> Cc: David Woodhouse <[email protected]> Cc: James Bottomley <[email protected]> Cc: Boaz Harrosh <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
This commit is contained in:
parent
a2dec7b363
commit
1011c1b9f2
9 changed files with 18 additions and 30 deletions
|
|
@ -426,15 +426,9 @@ static void i2o_block_end_request(struct request *req, int error,
|
|||
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 @@ static int i2o_block_transfer(struct request *req)
|
|||
|
||||
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++ =
|
||||
|
|
|
|||
Loading…
Reference in a new issue