* [patch 1/2] [SCSI] target: remove an unused variable
@ 2011-01-03 5:57 Dan Carpenter
2011-01-04 23:37 ` Nicholas A. Bellinger
0 siblings, 1 reply; 2+ messages in thread
From: Dan Carpenter @ 2011-01-03 5:57 UTC (permalink / raw)
To: Nicholas A. Bellinger
Cc: James Bottomley, linux-kernel, kernel-janitors, linux-scsi
We never use "fabric_cg" and also we leak it on the success path.
Signed-off-by: Dan Carpenter <error27@gmail.com>
diff --git a/drivers/target/target_core_configfs.c b/drivers/target/target_core_configfs.c
index 18d15ff..d7b977d 100644
--- a/drivers/target/target_core_configfs.c
+++ b/drivers/target/target_core_configfs.c
@@ -117,7 +117,6 @@ static struct config_group *target_core_register_fabric(
struct config_group *group,
const char *name)
{
- struct config_group *fabric_cg;
struct target_fabric_configfs *tf;
int ret;
@@ -131,9 +130,6 @@ static struct config_group *target_core_register_fabric(
if (transport_subsystem_check_init() < 0)
return ERR_PTR(-EINVAL);
- fabric_cg = kzalloc(sizeof(struct config_group), GFP_KERNEL);
- if (!(fabric_cg))
- return ERR_PTR(-ENOMEM);
/*
* Below are some hardcoded request_module() calls to automatically
* local fabric modules when the following is called:
@@ -155,7 +151,6 @@ static struct config_group *target_core_register_fabric(
if (ret < 0) {
printk(KERN_ERR "request_module() failed for"
" iscsi_target_mod.ko: %d\n", ret);
- kfree(fabric_cg);
return ERR_PTR(-EINVAL);
}
} else if (!(strncmp(name, "loopback", 8))) {
@@ -169,7 +164,6 @@ static struct config_group *target_core_register_fabric(
if (ret < 0) {
printk(KERN_ERR "request_module() failed for"
" tcm_loop.ko: %d\n", ret);
- kfree(fabric_cg);
return ERR_PTR(-EINVAL);
}
}
@@ -178,7 +172,6 @@ static struct config_group *target_core_register_fabric(
if (!(tf)) {
printk(KERN_ERR "target_core_get_fabric() failed for %s\n",
name);
- kfree(fabric_cg);
return ERR_PTR(-EINVAL);
}
printk(KERN_INFO "Target_Core_ConfigFS: REGISTER -> Located fabric:"
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [patch 1/2] [SCSI] target: remove an unused variable
2011-01-03 5:57 [patch 1/2] [SCSI] target: remove an unused variable Dan Carpenter
@ 2011-01-04 23:37 ` Nicholas A. Bellinger
0 siblings, 0 replies; 2+ messages in thread
From: Nicholas A. Bellinger @ 2011-01-04 23:37 UTC (permalink / raw)
To: Dan Carpenter; +Cc: James Bottomley, linux-kernel, kernel-janitors, linux-scsi
On Mon, 2011-01-03 at 08:57 +0300, Dan Carpenter wrote:
> We never use "fabric_cg" and also we leak it on the success path.
>
> Signed-off-by: Dan Carpenter <error27@gmail.com>
>
Hi Dan,
Thanks for catching this left over allocation from v3.x days before
target_core_register_fabric() accepted the fabric module's top level
struct config_group.
Committed as 7e7d89f6cf into lio-core-2.6.git.
Best Regards,
--nab
> diff --git a/drivers/target/target_core_configfs.c b/drivers/target/target_core_configfs.c
> index 18d15ff..d7b977d 100644
> --- a/drivers/target/target_core_configfs.c
> +++ b/drivers/target/target_core_configfs.c
> @@ -117,7 +117,6 @@ static struct config_group *target_core_register_fabric(
> struct config_group *group,
> const char *name)
> {
> - struct config_group *fabric_cg;
> struct target_fabric_configfs *tf;
> int ret;
>
> @@ -131,9 +130,6 @@ static struct config_group *target_core_register_fabric(
> if (transport_subsystem_check_init() < 0)
> return ERR_PTR(-EINVAL);
>
> - fabric_cg = kzalloc(sizeof(struct config_group), GFP_KERNEL);
> - if (!(fabric_cg))
> - return ERR_PTR(-ENOMEM);
> /*
> * Below are some hardcoded request_module() calls to automatically
> * local fabric modules when the following is called:
> @@ -155,7 +151,6 @@ static struct config_group *target_core_register_fabric(
> if (ret < 0) {
> printk(KERN_ERR "request_module() failed for"
> " iscsi_target_mod.ko: %d\n", ret);
> - kfree(fabric_cg);
> return ERR_PTR(-EINVAL);
> }
> } else if (!(strncmp(name, "loopback", 8))) {
> @@ -169,7 +164,6 @@ static struct config_group *target_core_register_fabric(
> if (ret < 0) {
> printk(KERN_ERR "request_module() failed for"
> " tcm_loop.ko: %d\n", ret);
> - kfree(fabric_cg);
> return ERR_PTR(-EINVAL);
> }
> }
> @@ -178,7 +172,6 @@ static struct config_group *target_core_register_fabric(
> if (!(tf)) {
> printk(KERN_ERR "target_core_get_fabric() failed for %s\n",
> name);
> - kfree(fabric_cg);
> return ERR_PTR(-EINVAL);
> }
> printk(KERN_INFO "Target_Core_ConfigFS: REGISTER -> Located fabric:"
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-01-04 23:43 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-01-03 5:57 [patch 1/2] [SCSI] target: remove an unused variable Dan Carpenter
2011-01-04 23:37 ` Nicholas A. Bellinger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).