Messages in this thread Patch in this message | | | Date | Mon, 2 Aug 2004 15:43:52 +0530 | From | Ravikiran G Thirumalai <> | Subject | Re: [patchset] Lockfree fd lookup 1 of 5 |
| |
Here's the first patch. This patch 'shrinks' struct kref by removing the release pointer in the struct kref. GregKH has applied this to his tree
Thanks, Kiran
D: D: Signed-off-by: Ravikiran Thirumalai <kiran@in.ibm.com> D: D: kref-merged-2.6.7.patch: D: This patch is the kref shrinkage patch which GregKH has agreed to include, D: and has applied to his tree which he will push into mainline. D: diff -ruN -X dontdiff2 linux-2.6.7/include/linux/kref.h files_struct-kref-2.6.7/include/linux/kref.h --- linux-2.6.7/include/linux/kref.h 2004-06-16 10:48:59.000000000 +0530 +++ files_struct-kref-2.6.7/include/linux/kref.h 2004-07-26 16:38:23.604361208 +0530 @@ -21,12 +21,11 @@ struct kref { atomic_t refcount; - void (*release)(struct kref *kref); }; -void kref_init(struct kref *kref, void (*release)(struct kref *)); +void kref_init(struct kref *kref); struct kref *kref_get(struct kref *kref); -void kref_put(struct kref *kref); +void kref_put(struct kref *kref, void (*release) (struct kref *kref)); #endif /* _KREF_H_ */ diff -ruN -X dontdiff2 linux-2.6.7/lib/kref.c files_struct-kref-2.6.7/lib/kref.c --- linux-2.6.7/lib/kref.c 2004-06-16 10:50:26.000000000 +0530 +++ files_struct-kref-2.6.7/lib/kref.c 2004-07-26 16:52:11.617484080 +0530 @@ -19,15 +19,10 @@ /** * kref_init - initialize object. * @kref: object in question. - * @release: pointer to a function that will clean up the object - * when the last reference to the object is released. - * This pointer is required. */ -void kref_init(struct kref *kref, void (*release)(struct kref *kref)) +void kref_init(struct kref *kref) { - WARN_ON(release == NULL); atomic_set(&kref->refcount,1); - kref->release = release; } /** @@ -44,14 +39,18 @@ /** * kref_put - decrement refcount for object. * @kref: object. + * @release: pointer to the function that will clean up the object + * when the last reference to the object is released. + * This pointer is required. * - * Decrement the refcount, and if 0, call kref->release(). + * Decrement the refcount, and if 0, call release(). */ -void kref_put(struct kref *kref) +void kref_put(struct kref *kref, void (*release) (struct kref *kref)) { + WARN_ON(release == NULL); if (atomic_dec_and_test(&kref->refcount)) { pr_debug("kref cleaning up\n"); - kref->release(kref); + release(kref); } } - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |