mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 19:29:37 +00:00
scsi: tcmu: remove useless code and clean up the code style.
Since the TCMU_RING_SIZE macro is not using here will discard it and at the same time clean up the code style. Signed-off-by: Xiubo Li <xiubli@redhat.com> Acked-by: Mike Christie <mchristi@redhat.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
parent
ce397d215c
commit
9554c1be48
1 changed files with 2 additions and 6 deletions
|
@ -83,14 +83,10 @@
|
||||||
#define DATA_BLOCK_SIZE PAGE_SIZE
|
#define DATA_BLOCK_SIZE PAGE_SIZE
|
||||||
#define DATA_BLOCK_SHIFT PAGE_SHIFT
|
#define DATA_BLOCK_SHIFT PAGE_SHIFT
|
||||||
#define DATA_BLOCK_BITS_DEF (256 * 1024)
|
#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_MBS_TO_BLOCKS(_mbs) (_mbs << (20 - DATA_BLOCK_SHIFT))
|
||||||
#define TCMU_BLOCKS_TO_MBS(_blocks) (_blocks >> (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)
|
* Default number of global data blocks(512K * PAGE_SIZE)
|
||||||
* when the unmap thread will be started.
|
* 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] ||
|
if (!info->attrs[TCMU_ATTR_CMD_STATUS] ||
|
||||||
!info->attrs[TCMU_ATTR_DEVICE_ID]) {
|
!info->attrs[TCMU_ATTR_DEVICE_ID]) {
|
||||||
printk(KERN_ERR "TCMU_ATTR_CMD_STATUS or TCMU_ATTR_DEVICE_ID not set, doing nothing\n");
|
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]);
|
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);
|
spin_unlock(&udev->nl_cmd_lock);
|
||||||
if (!is_removed)
|
if (!is_removed)
|
||||||
target_undepend_item(&dev->dev_group.cg_item);
|
target_undepend_item(&dev->dev_group.cg_item);
|
||||||
if (!ret)
|
if (!ret)
|
||||||
complete(&nl_cmd->complete);
|
complete(&nl_cmd->complete);
|
||||||
return ret;
|
return ret;
|
||||||
|
|
Loading…
Reference in a new issue