* [PATCH 1/9] drivers/block/aoe/aoecmd.c: Remove useless kfree
@ 2012-09-12 15:06 Peter Senna Tschudin
2012-09-13 1:41 ` Ed Cashin
2012-09-13 14:13 ` walter harms
0 siblings, 2 replies; 5+ messages in thread
From: Peter Senna Tschudin @ 2012-09-12 15:06 UTC (permalink / raw)
To: Ed L. Cashin; +Cc: kernel-janitors, linux-kernel
From: Peter Senna Tschudin <peter.senna@gmail.com>
Remove useless kfree() and clean up code related to the removal.
The semantic patch that finds this problem is as follows:
(http://coccinelle.lip6.fr/)
// <smpl>
@r exists@
position p1,p2;
expression x;
@@
if (x@p1 == NULL) { ... kfree@p2(x); ... return ...; }
@unchanged exists@
position r.p1,r.p2;
expression e <= r.x,x,e1;
iterator I;
statement S;
@@
if (x@p1 == NULL) { ... when != I(x,...) S
when != e = e1
when != e += e1
when != e -= e1
when != ++e
when != --e
when != e++
when != e--
when != &e
kfree@p2(x); ... return ...; }
@ok depends on unchanged exists@
position any r.p1;
position r.p2;
expression x;
@@
... when != true x@p1 == NULL
kfree@p2(x);
@depends on !ok && unchanged@
position r.p2;
expression x;
@@
*kfree@p2(x);
// </smpl>
Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
---
drivers/block/aoe/aoecmd.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/block/aoe/aoecmd.c b/drivers/block/aoe/aoecmd.c
index 5461faa..cbb0521 100644
--- a/drivers/block/aoe/aoecmd.c
+++ b/drivers/block/aoe/aoecmd.c
@@ -1257,7 +1257,6 @@ addtgt(struct aoedev *d, char *addr, ulong nframes)
}
t = kcalloc(1, sizeof *t, GFP_ATOMIC);
if (!t) {
- kfree(t);
printk(KERN_INFO "aoe: cannot allocate memory to add target\n");
return NULL;
}
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH 1/9] drivers/block/aoe/aoecmd.c: Remove useless kfree
2012-09-12 15:06 [PATCH 1/9] drivers/block/aoe/aoecmd.c: Remove useless kfree Peter Senna Tschudin
@ 2012-09-13 1:41 ` Ed Cashin
2012-09-13 14:13 ` walter harms
1 sibling, 0 replies; 5+ messages in thread
From: Ed Cashin @ 2012-09-13 1:41 UTC (permalink / raw)
To: Peter Senna Tschudin
Cc: kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org
There's a patch in the mm tree that already makes this change, thanks.
Sent from my iPhone
On Sep 12, 2012, at 5:08 AM, "Peter Senna Tschudin" <peter.senna@gmail.com> wrote:
> From: Peter Senna Tschudin <peter.senna@gmail.com>
>
> Remove useless kfree() and clean up code related to the removal.
>
> The semantic patch that finds this problem is as follows:
> (http://coccinelle.lip6.fr/)
>
> // <smpl>
> @r exists@
> position p1,p2;
> expression x;
> @@
>
> if (x@p1 == NULL) { ... kfree@p2(x); ... return ...; }
>
> @unchanged exists@
> position r.p1,r.p2;
> expression e <= r.x,x,e1;
> iterator I;
> statement S;
> @@
>
> if (x@p1 == NULL) { ... when != I(x,...) S
> when != e = e1
> when != e += e1
> when != e -= e1
> when != ++e
> when != --e
> when != e++
> when != e--
> when != &e
> kfree@p2(x); ... return ...; }
>
> @ok depends on unchanged exists@
> position any r.p1;
> position r.p2;
> expression x;
> @@
>
> ... when != true x@p1 == NULL
> kfree@p2(x);
>
> @depends on !ok && unchanged@
> position r.p2;
> expression x;
> @@
>
> *kfree@p2(x);
> // </smpl>
>
> Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
>
> ---
> drivers/block/aoe/aoecmd.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/drivers/block/aoe/aoecmd.c b/drivers/block/aoe/aoecmd.c
> index 5461faa..cbb0521 100644
> --- a/drivers/block/aoe/aoecmd.c
> +++ b/drivers/block/aoe/aoecmd.c
> @@ -1257,7 +1257,6 @@ addtgt(struct aoedev *d, char *addr, ulong nframes)
> }
> t = kcalloc(1, sizeof *t, GFP_ATOMIC);
> if (!t) {
> - kfree(t);
> printk(KERN_INFO "aoe: cannot allocate memory to add target\n");
> return NULL;
> }
>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH 1/9] drivers/block/aoe/aoecmd.c: Remove useless kfree
2012-09-12 15:06 [PATCH 1/9] drivers/block/aoe/aoecmd.c: Remove useless kfree Peter Senna Tschudin
2012-09-13 1:41 ` Ed Cashin
@ 2012-09-13 14:13 ` walter harms
2012-09-13 14:42 ` Dan Carpenter
1 sibling, 1 reply; 5+ messages in thread
From: walter harms @ 2012-09-13 14:13 UTC (permalink / raw)
To: Peter Senna Tschudin; +Cc: Ed L. Cashin, kernel-janitors, linux-kernel
Am 12.09.2012 17:06, schrieb Peter Senna Tschudin:
> From: Peter Senna Tschudin <peter.senna@gmail.com>
>
> Remove useless kfree() and clean up code related to the removal.
>
> The semantic patch that finds this problem is as follows:
> (http://coccinelle.lip6.fr/)
>
> // <smpl>
> @r exists@
> position p1,p2;
> expression x;
> @@
>
> if (x@p1 == NULL) { ... kfree@p2(x); ... return ...; }
>
> @unchanged exists@
> position r.p1,r.p2;
> expression e <= r.x,x,e1;
> iterator I;
> statement S;
> @@
>
> if (x@p1 == NULL) { ... when != I(x,...) S
> when != e = e1
> when != e += e1
> when != e -= e1
> when != ++e
> when != --e
> when != e++
> when != e--
> when != &e
> kfree@p2(x); ... return ...; }
>
> @ok depends on unchanged exists@
> position any r.p1;
> position r.p2;
> expression x;
> @@
>
> ... when != true x@p1 == NULL
> kfree@p2(x);
>
> @depends on !ok && unchanged@
> position r.p2;
> expression x;
> @@
>
> *kfree@p2(x);
> // </smpl>
>
> Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
>
> ---
> drivers/block/aoe/aoecmd.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/drivers/block/aoe/aoecmd.c b/drivers/block/aoe/aoecmd.c
> index 5461faa..cbb0521 100644
> --- a/drivers/block/aoe/aoecmd.c
> +++ b/drivers/block/aoe/aoecmd.c
> @@ -1257,7 +1257,6 @@ addtgt(struct aoedev *d, char *addr, ulong nframes)
> }
> t = kcalloc(1, sizeof *t, GFP_ATOMIC);
> if (!t) {
> - kfree(t);
> printk(KERN_INFO "aoe: cannot allocate memory to add target\n");
> return NULL;
> }
>
this should read kzalloc(sizeof (*t), GFP_ATOMIC);
see: [PATCH 3/9] drivers/gpu/drm/ttm/ttm_page_alloc_dma.c: Remove useless kfree
re,
wh
> --
> To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH 1/9] drivers/block/aoe/aoecmd.c: Remove useless kfree
2012-09-13 14:13 ` walter harms
@ 2012-09-13 14:42 ` Dan Carpenter
2012-09-14 7:42 ` Peter Senna Tschudin
0 siblings, 1 reply; 5+ messages in thread
From: Dan Carpenter @ 2012-09-13 14:42 UTC (permalink / raw)
To: walter harms
Cc: Peter Senna Tschudin, Ed L. Cashin, kernel-janitors, linux-kernel
On Thu, Sep 13, 2012 at 04:13:07PM +0200, walter harms wrote:
> > diff --git a/drivers/block/aoe/aoecmd.c b/drivers/block/aoe/aoecmd.c
> > index 5461faa..cbb0521 100644
> > --- a/drivers/block/aoe/aoecmd.c
> > +++ b/drivers/block/aoe/aoecmd.c
> > @@ -1257,7 +1257,6 @@ addtgt(struct aoedev *d, char *addr, ulong nframes)
> > }
> > t = kcalloc(1, sizeof *t, GFP_ATOMIC);
> > if (!t) {
> > - kfree(t);
> > printk(KERN_INFO "aoe: cannot allocate memory to add target\n");
> > return NULL;
> > }
> >
>
>
> this should read kzalloc(sizeof (*t), GFP_ATOMIC);
> see: [PATCH 3/9] drivers/gpu/drm/ttm/ttm_page_alloc_dma.c: Remove useless kfree
I already fixed this one last week actually. I did it the way
Walter suggests.
regards,
dan carpenter
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH 1/9] drivers/block/aoe/aoecmd.c: Remove useless kfree
2012-09-13 14:42 ` Dan Carpenter
@ 2012-09-14 7:42 ` Peter Senna Tschudin
0 siblings, 0 replies; 5+ messages in thread
From: Peter Senna Tschudin @ 2012-09-14 7:42 UTC (permalink / raw)
To: Dan Carpenter; +Cc: walter harms, Ed L. Cashin, kernel-janitors, linux-kernel
On Thu, Sep 13, 2012 at 4:42 PM, Dan Carpenter <dan.carpenter@oracle.com> wrote:
> On Thu, Sep 13, 2012 at 04:13:07PM +0200, walter harms wrote:
>> > diff --git a/drivers/block/aoe/aoecmd.c b/drivers/block/aoe/aoecmd.c
>> > index 5461faa..cbb0521 100644
>> > --- a/drivers/block/aoe/aoecmd.c
>> > +++ b/drivers/block/aoe/aoecmd.c
>> > @@ -1257,7 +1257,6 @@ addtgt(struct aoedev *d, char *addr, ulong nframes)
>> > }
>> > t = kcalloc(1, sizeof *t, GFP_ATOMIC);
>> > if (!t) {
>> > - kfree(t);
>> > printk(KERN_INFO "aoe: cannot allocate memory to add target\n");
>> > return NULL;
>> > }
>> >
>>
>>
>> this should read kzalloc(sizeof (*t), GFP_ATOMIC);
>> see: [PATCH 3/9] drivers/gpu/drm/ttm/ttm_page_alloc_dma.c: Remove useless kfree
>
> I already fixed this one last week actually. I did it the way
> Walter suggests.
So please ignore my patch.
>
> regards,
> dan carpenter
>
--
Peter
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2012-09-14 7:42 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-12 15:06 [PATCH 1/9] drivers/block/aoe/aoecmd.c: Remove useless kfree Peter Senna Tschudin
2012-09-13 1:41 ` Ed Cashin
2012-09-13 14:13 ` walter harms
2012-09-13 14:42 ` Dan Carpenter
2012-09-14 7:42 ` Peter Senna Tschudin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox