From: Ben Peddell <klightspeed@killerwolves.net>
To: linux-kernel@vger.kernel.org
Subject: [PATCH 1/2] 3.4.y target: Move dev->dev_link_magic check
Date: Sun, 3 Feb 2013 18:33:27 +1000 [thread overview]
Message-ID: <20130203083415.90F01B6002@kepler.killerwolves.net> (raw)
In-Reply-To: <510E207F.1@killerwolves.net>
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 b009b89..31de881 100644
--- a/drivers/target/target_core_fabric_configfs.c
+++ b/drivers/target/target_core_fabric_configfs.c
@@ -752,12 +752,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);
@@ -776,6 +770,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->se_hba, dev,
lun->unpacked_lun);
if (IS_ERR(lun_p)) {
--
1.7.8.6
next prev parent reply other threads:[~2013-02-03 8:42 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-03 8:31 [PATCH 0/2] target: OOPS in target_fabric_port_link on v3.7.4 and v3.4.27 Ben Peddell
2013-02-03 8:33 ` Ben Peddell [this message]
2013-02-03 8:34 ` [PATCH 2/2] 3.7.y target: Move dev->dev_link_magic check Ben Peddell
2013-02-03 9:42 ` [PATCH 0/2] target: OOPS in target_fabric_port_link on v3.7.4 and v3.4.27 Ben Peddell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130203083415.90F01B6002@kepler.killerwolves.net \
--to=klightspeed@killerwolves.net \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®