summaryrefslogtreecommitdiffstats
path: root/drivers/target
diff options
context:
space:
mode:
authorSebastian Andrzej Siewior <bigeasy@linutronix.de>2011-11-25 22:18:45 +0100
committerNicholas Bellinger <nab@linux-iscsi.org>2011-12-06 06:00:57 +0000
commit5bff9e8584fbcdb361dada5a0425724b9e31e608 (patch)
treea16f405f1165e03f0bf7a8d6053aa772b8545a5d /drivers/target
parent6f21475576dde397cd2580262209d4080fbd5458 (diff)
downloadlinux-stable-5bff9e8584fbcdb361dada5a0425724b9e31e608.tar.gz
linux-stable-5bff9e8584fbcdb361dada5a0425724b9e31e608.tar.bz2
linux-stable-5bff9e8584fbcdb361dada5a0425724b9e31e608.zip
target/rd: simplify the page/offset computation
Breakout rd_MEMCPY_do_task() usage of do_div() to tmp value during rd_request->rd_page assignment. Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
Diffstat (limited to 'drivers/target')
-rw-r--r--drivers/target/target_core_rd.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/target/target_core_rd.c b/drivers/target/target_core_rd.c
index 6d8a6881cfff..6119ed5a3311 100644
--- a/drivers/target/target_core_rd.c
+++ b/drivers/target/target_core_rd.c
@@ -583,14 +583,12 @@ static int rd_MEMCPY_do_task(struct se_task *task)
{
struct se_device *dev = task->task_se_cmd->se_dev;
struct rd_request *req = RD_REQ(task);
- unsigned long long lba;
+ u64 tmp;
int ret;
- req->rd_page = (task->task_lba * dev->se_sub_dev->se_dev_attrib.block_size) / PAGE_SIZE;
- lba = task->task_lba;
- req->rd_offset = (do_div(lba,
- (PAGE_SIZE / dev->se_sub_dev->se_dev_attrib.block_size))) *
- dev->se_sub_dev->se_dev_attrib.block_size;
+ tmp = task->task_lba * dev->se_sub_dev->se_dev_attrib.block_size;
+ req->rd_offset = do_div(tmp, PAGE_SIZE);
+ req->rd_page = tmp;
req->rd_size = task->task_size;
if (task->task_data_direction == DMA_FROM_DEVICE)