Commit d41570b7469724005eb78448a69289900f911963

Authored by Peter Senna Tschudin
Committed by Jens Axboe
1 parent e32463b2f7

block/blk-tag.c: Remove useless kfree

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>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

Showing 1 changed file with 2 additions and 4 deletions Side-by-side Diff

... ... @@ -186,7 +186,8 @@
186 186 tags = __blk_queue_init_tags(q, depth);
187 187  
188 188 if (!tags)
189   - goto fail;
  189 + return -ENOMEM;
  190 +
190 191 } else if (q->queue_tags) {
191 192 rc = blk_queue_resize_tags(q, depth);
192 193 if (rc)
... ... @@ -203,9 +204,6 @@
203 204 queue_flag_set_unlocked(QUEUE_FLAG_QUEUED, q);
204 205 INIT_LIST_HEAD(&q->tag_busy_list);
205 206 return 0;
206   -fail:
207   - kfree(tags);
208   - return -ENOMEM;
209 207 }
210 208 EXPORT_SYMBOL(blk_queue_init_tags);
211 209