UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

target: simplify target_xcopy_init_pt_lun 

Drop unused argument & return value and consolidate a duplicate assignment.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
This commit is contained in:
Christoph Hellwig 2015-04-07 19:11:17 +02:00 committed by Nicholas Bellinger
parent c3d0a7c21d
commit 2c336e3a2e
1 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/target/target_core_xcopy.c
View File

@ -540,33 +540,22 @@ static void target_xcopy_setup_pt_port(
} }
} }
static int target_xcopy_init_pt_lun( static void target_xcopy_init_pt_lun(struct se_device *se_dev,
struct xcopy_pt_cmd *xpt_cmd, struct se_cmd *pt_cmd, bool remote_port)
struct xcopy_op *xop,
struct se_device *se_dev,
struct se_cmd *pt_cmd,
bool remote_port)
{ {
/* /*
* Don't allocate + init an pt_cmd->se_lun if honoring local port for * Don't allocate + init an pt_cmd->se_lun if honoring local port for
* reservations. The pt_cmd->se_lun pointer will be setup from within * reservations. The pt_cmd->se_lun pointer will be setup from within
* target_xcopy_setup_pt_port() * target_xcopy_setup_pt_port()
*/ */
if (!remote_port) { if (remote_port) {
pt_cmd->se_cmd_flags |= SCF_SE_LUN_CMD; pr_debug("Setup emulated se_dev: %p from se_dev\n",
return 0; pt_cmd->se_dev);
pt_cmd->se_lun = &se_dev->xcopy_lun;
pt_cmd->se_dev = se_dev;
} }
pt_cmd->se_lun = &se_dev->xcopy_lun;
pt_cmd->se_dev = se_dev;
pr_debug("Setup emulated se_dev: %p from se_dev\n", pt_cmd->se_dev);
pt_cmd->se_cmd_flags |= SCF_SE_LUN_CMD; pt_cmd->se_cmd_flags |= SCF_SE_LUN_CMD;
pr_debug("Setup emulated se_dev: %p to pt_cmd->se_lun->lun_se_dev\n",
pt_cmd->se_lun->lun_se_dev);
return 0;
} }
static int target_xcopy_setup_pt_cmd( static int target_xcopy_setup_pt_cmd(
@ -584,11 +573,8 @@ static int target_xcopy_setup_pt_cmd(
* Setup LUN+port to honor reservations based upon xop->op_origin for * Setup LUN+port to honor reservations based upon xop->op_origin for
* X-COPY PUSH or X-COPY PULL based upon where the CDB was received. * X-COPY PUSH or X-COPY PULL based upon where the CDB was received.
*/ */
rc = target_xcopy_init_pt_lun(xpt_cmd, xop, se_dev, cmd, remote_port); target_xcopy_init_pt_lun(se_dev, cmd, remote_port);
if (rc < 0) {
ret = rc;
goto out;
}
xpt_cmd->xcopy_op = xop; xpt_cmd->xcopy_op = xop;
target_xcopy_setup_pt_port(xpt_cmd, xop, remote_port); target_xcopy_setup_pt_port(xpt_cmd, xop, remote_port);