|
@@ -83,14 +83,10 @@
|
|
|
#define DATA_BLOCK_SIZE PAGE_SIZE
|
|
|
#define DATA_BLOCK_SHIFT PAGE_SHIFT
|
|
|
#define DATA_BLOCK_BITS_DEF (256 * 1024)
|
|
|
-#define DATA_SIZE (DATA_BLOCK_BITS * DATA_BLOCK_SIZE)
|
|
|
|
|
|
#define TCMU_MBS_TO_BLOCKS(_mbs) (_mbs << (20 - DATA_BLOCK_SHIFT))
|
|
|
#define TCMU_BLOCKS_TO_MBS(_blocks) (_blocks >> (20 - DATA_BLOCK_SHIFT))
|
|
|
|
|
|
-/* The total size of the ring is 8M + 256K * PAGE_SIZE */
|
|
|
-#define TCMU_RING_SIZE (CMDR_SIZE + DATA_SIZE)
|
|
|
-
|
|
|
/*
|
|
|
* Default number of global data blocks(512K * PAGE_SIZE)
|
|
|
* when the unmap thread will be started.
|
|
@@ -283,7 +279,7 @@ static int tcmu_genl_cmd_done(struct genl_info *info, int completed_cmd)
|
|
|
if (!info->attrs[TCMU_ATTR_CMD_STATUS] ||
|
|
|
!info->attrs[TCMU_ATTR_DEVICE_ID]) {
|
|
|
printk(KERN_ERR "TCMU_ATTR_CMD_STATUS or TCMU_ATTR_DEVICE_ID not set, doing nothing\n");
|
|
|
- return -EINVAL;
|
|
|
+ return -EINVAL;
|
|
|
}
|
|
|
|
|
|
dev_id = nla_get_u32(info->attrs[TCMU_ATTR_DEVICE_ID]);
|
|
@@ -313,7 +309,7 @@ static int tcmu_genl_cmd_done(struct genl_info *info, int completed_cmd)
|
|
|
|
|
|
spin_unlock(&udev->nl_cmd_lock);
|
|
|
if (!is_removed)
|
|
|
- target_undepend_item(&dev->dev_group.cg_item);
|
|
|
+ target_undepend_item(&dev->dev_group.cg_item);
|
|
|
if (!ret)
|
|
|
complete(&nl_cmd->complete);
|
|
|
return ret;
|