| Message ID | 20140129131756.GC10678@elgon.mountain |
|---|---|
| State | Accepted |
| Commit | 5547fec74a566e1f5e00a937b9a367f7c6a94a8b |
| Headers | show |
Am 29.01.2014 14:17, schrieb Dan Carpenter: > Move the kmem_cache_free() calls down a couple lines. > > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Thanks for fixing this Dan! Acked-by: Richard Weinberger <richard@nod.at> > diff --git a/drivers/mtd/ubi/fastmap.c b/drivers/mtd/ubi/fastmap.c > index ead861307b3c..c5dad652614d 100644 > --- a/drivers/mtd/ubi/fastmap.c > +++ b/drivers/mtd/ubi/fastmap.c > @@ -463,8 +463,8 @@ static int scan_pool(struct ubi_device *ubi, struct ubi_attach_info *ai, > } > } > if (found_orphan) { > - kmem_cache_free(ai->aeb_slab_cache, tmp_aeb); > list_del(&tmp_aeb->u.list); > + kmem_cache_free(ai->aeb_slab_cache, tmp_aeb); > } > > new_aeb = kmem_cache_alloc(ai->aeb_slab_cache, > @@ -846,16 +846,16 @@ fail_bad: > ret = UBI_BAD_FASTMAP; > fail: > list_for_each_entry_safe(tmp_aeb, _tmp_aeb, &used, u.list) { > - kmem_cache_free(ai->aeb_slab_cache, tmp_aeb); > list_del(&tmp_aeb->u.list); > + kmem_cache_free(ai->aeb_slab_cache, tmp_aeb); > } > list_for_each_entry_safe(tmp_aeb, _tmp_aeb, &eba_orphans, u.list) { > - kmem_cache_free(ai->aeb_slab_cache, tmp_aeb); > list_del(&tmp_aeb->u.list); > + kmem_cache_free(ai->aeb_slab_cache, tmp_aeb); > } > list_for_each_entry_safe(tmp_aeb, _tmp_aeb, &free, u.list) { > - kmem_cache_free(ai->aeb_slab_cache, tmp_aeb); > list_del(&tmp_aeb->u.list); > + kmem_cache_free(ai->aeb_slab_cache, tmp_aeb); > } > > return ret; >
On Wed, 2014-01-29 at 16:17 +0300, Dan Carpenter wrote: > Move the kmem_cache_free() calls down a couple lines. > > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Pushed to linux-ubifs.git, thanks! I'll send this to Linus for 3.13 inclusion.
diff --git a/drivers/mtd/ubi/fastmap.c b/drivers/mtd/ubi/fastmap.c index ead861307b3c..c5dad652614d 100644 --- a/drivers/mtd/ubi/fastmap.c +++ b/drivers/mtd/ubi/fastmap.c @@ -463,8 +463,8 @@ static int scan_pool(struct ubi_device *ubi, struct ubi_attach_info *ai, } } if (found_orphan) { - kmem_cache_free(ai->aeb_slab_cache, tmp_aeb); list_del(&tmp_aeb->u.list); + kmem_cache_free(ai->aeb_slab_cache, tmp_aeb); } new_aeb = kmem_cache_alloc(ai->aeb_slab_cache, @@ -846,16 +846,16 @@ fail_bad: ret = UBI_BAD_FASTMAP; fail: list_for_each_entry_safe(tmp_aeb, _tmp_aeb, &used, u.list) { - kmem_cache_free(ai->aeb_slab_cache, tmp_aeb); list_del(&tmp_aeb->u.list); + kmem_cache_free(ai->aeb_slab_cache, tmp_aeb); } list_for_each_entry_safe(tmp_aeb, _tmp_aeb, &eba_orphans, u.list) { - kmem_cache_free(ai->aeb_slab_cache, tmp_aeb); list_del(&tmp_aeb->u.list); + kmem_cache_free(ai->aeb_slab_cache, tmp_aeb); } list_for_each_entry_safe(tmp_aeb, _tmp_aeb, &free, u.list) { - kmem_cache_free(ai->aeb_slab_cache, tmp_aeb); list_del(&tmp_aeb->u.list); + kmem_cache_free(ai->aeb_slab_cache, tmp_aeb); } return ret;
Move the kmem_cache_free() calls down a couple lines. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>