Messages in this thread Patch in this message | | | From | Ben Peddell <> | Date | Sun, 3 Feb 2013 18:34:13 +1000 | Subject | [PATCH 2/2] 3.7.y target: Move dev->dev_link_magic check |
| |
Commit fdf9d862969f1be18814273b03fb9497ec2dbdae (target: Add link_magic for fabric allow_link destination target_items) applied without commit 0fd97ccf45be26fb01b3a412f1f6c6b5044b2f16 (Simplify the code a lot by killing the superflous struct se_subsystem_dev) has the dev->dev_link_magic check before dev is initialized in target_fabric_port_link. This patch moves the dev->dev_link_magic check to after dev is initialized.
Signed-off-by: Ben Peddell <klightspeed@killerwolves.net> --- drivers/target/target_core_fabric_configfs.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/target/target_core_fabric_configfs.c b/drivers/target/target_core_fabric_configfs.c index a55f91a..d7bb0c0 100644 --- a/drivers/target/target_core_fabric_configfs.c +++ b/drivers/target/target_core_fabric_configfs.c @@ -751,12 +751,6 @@ static int target_fabric_port_link( struct target_fabric_configfs *tf; int ret; - if (dev->dev_link_magic != SE_DEV_LINK_MAGIC) { - pr_err("Bad dev->dev_link_magic, not a valid se_dev_ci pointer:" - " %p to struct se_device: %p\n", se_dev_ci, dev); - return -EFAULT; - } - tpg_ci = &lun_ci->ci_parent->ci_group->cg_item; se_tpg = container_of(to_config_group(tpg_ci), struct se_portal_group, tpg_group); @@ -775,6 +769,12 @@ static int target_fabric_port_link( goto out; } + if (dev->dev_link_magic != SE_DEV_LINK_MAGIC) { + pr_err("Bad dev->dev_link_magic, not a valid se_dev_ci pointer:" + " %p to struct se_device: %p\n", se_dev_ci, dev); + return -EFAULT; + } + lun_p = core_dev_add_lun(se_tpg, dev, lun->unpacked_lun); if (IS_ERR(lun_p)) { pr_err("core_dev_add_lun() failed\n"); -- 1.7.8.6
| |