Skip to contentSkip to conversation

rbd: Use kmem_cache_free

PATCH In review Himangi Saraogi 2 participants 2 messages Jul 22, 2014

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 rbd: Use kmem_cache_free

Free memory allocated using kmem_cache_zalloc using kmem_cache_free rather than kfree.

The Coccinelle semantic patch that makes this change is as follows:

// <smpl>
@@
expression x,E,c;
@@

x = \(kmem_cache_alloc\|kmem_cache_zalloc\|kmem_cache_alloc_node\)(c,...) ... when != x = E

     when != &x

?-kfree(x)
+kmem_cache_free(c,x)
// </smpl>

---
 drivers/block/rbd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/block/rbd.c +1 -1
index b2c98c1..8381c54 100644
@@ -1158,7 +1158,7 @@ static const char *rbd_segment_name(struct rbd_device *rbd_dev, u64 offset)
 	if (ret < 0 || ret > CEPH_MAX_OID_NAME_LEN) {
 		pr_err("error formatting segment name for #%llu (%d)\n",
 			segment, ret);
-		kfree(name);
+		kmem_cache_free(rbd_segment_name_cache, name);
 		name = NULL;
 	}
 
Signature · 1 line
1.9.1
#1 lore raw
Quoted 28 lines · Himangi Saraogi

Free memory allocated using kmem_cache_zalloc using kmem_cache_free rather than kfree.

The Coccinelle semantic patch that makes this change is as follows:

// <smpl>
@@
expression x,E,c;
@@

x = \(kmem_cache_alloc\|kmem_cache_zalloc\|kmem_cache_alloc_node\)(c,...) ... when != x = E

     when != &x

?-kfree(x)
+kmem_cache_free(c,x)
// </smpl>

---
 drivers/block/rbd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/block/rbd.c +0 -0
index b2c98c1..8381c54 100644

drivers/block/rbd.c static const char *rbd_segment_name(struct rbd_device *rbd_dev, u64 offset) · line 1163

Quoted 7 lines
drivers/block/rbd.c +1 -1
@@ -1158,7 +1158,7 @@ static const char *rbd_segment_name(struct rbd_device *rbd_dev, u64 offset)
        if (ret < 0 || ret > CEPH_MAX_OID_NAME_LEN) {
                pr_err("error formatting segment name for #%llu (%d)\n",
                        segment, ret);
-               kfree(name);
+               kmem_cache_free(rbd_segment_name_cache, name);
                name = NULL;
        }

We seem to have a helper for this, rbd_segment_name_free(). Care to resend?

Thanks,

Ilya