target: Convert to DIV_ROUND_UP_SECTOR_T usage for sectors / dev_max_sectors
authorNicholas Bellinger <nab@linux-iscsi.org>
Tue, 26 Jul 2011 07:38:40 +0000 (00:38 -0700)
committerNicholas Bellinger <nab@linux-iscsi.org>
Tue, 26 Jul 2011 09:40:34 +0000 (09:40 +0000)
This patch adds the new macro usage of include/linux/kernel.h:DIV_ROUND_UP_SECTOR_T
for the new DIV_ROUND_UP_ULL() usage for 32-bit architectures with unsigned long long
sector_t division in transport_allocate_data_tasks() usage for target_core_mod v4.1

Reported-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Nicholas A. Bellinger <nab@linux-iscsi.org>
drivers/target/target_core_transport.c

index 46352d658e35b5d2698dc95d75ce9d6eb1c1cd58..c75a01a1c4757976b776634f0fe14d00aa35b313 100644 (file)
@@ -4052,17 +4052,16 @@ static int transport_allocate_data_tasks(
        struct se_task *task;
        struct se_device *dev = cmd->se_dev;
        unsigned long flags;
-       sector_t sectors;
        int task_count, i, ret;
-       sector_t dev_max_sectors = dev->se_sub_dev->se_dev_attrib.max_sectors;
+       sector_t sectors, dev_max_sectors = dev->se_sub_dev->se_dev_attrib.max_sectors;
        u32 sector_size = dev->se_sub_dev->se_dev_attrib.block_size;
        struct scatterlist *sg;
        struct scatterlist *cmd_sg;
 
        WARN_ON(cmd->data_length % sector_size);
        sectors = DIV_ROUND_UP(cmd->data_length, sector_size);
-       task_count = DIV_ROUND_UP(sectors, dev_max_sectors);
-
+       task_count = DIV_ROUND_UP_SECTOR_T(sectors, dev_max_sectors);
+       
        cmd_sg = sgl;
        for (i = 0; i < task_count; i++) {
                unsigned int task_size;