git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.3
[linux-2.6.git]
/
lib
/
kref.c
diff --git
a/lib/kref.c
b/lib/kref.c
index
ee141ad
..
2218b7a
100644
(file)
--- a/
lib/kref.c
+++ b/
lib/kref.c
@@
-11,48
+11,45
@@
*
*/
*
*/
-/* #define DEBUG */
-
#include <linux/kref.h>
#include <linux/module.h>
/**
* kref_init - initialize object.
* @kref: object in question.
#include <linux/kref.h>
#include <linux/module.h>
/**
* 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);
atomic_set(&kref->refcount,1);
- kref->release = release;
}
/**
* kref_get - increment refcount for object.
* @kref: object.
*/
}
/**
* kref_get - increment refcount for object.
* @kref: object.
*/
-
struct kref *
kref_get(struct kref *kref)
+
void
kref_get(struct kref *kref)
{
WARN_ON(!atomic_read(&kref->refcount));
atomic_inc(&kref->refcount);
{
WARN_ON(!atomic_read(&kref->refcount));
atomic_inc(&kref->refcount);
- return kref;
}
/**
* kref_put - decrement refcount for object.
* @kref: object.
}
/**
* 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, and it is not acceptable to pass kfree
+ * in as this function.
*
*
- * 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)
)
{
{
- if (atomic_dec_and_test(&kref->refcount)) {
- pr_debug("kref cleaning up\n");
- kref->release(kref);
- }
+ WARN_ON(release == NULL);
+ WARN_ON(release == (void (*)(struct kref *))kfree);
+
+ if (atomic_dec_and_test(&kref->refcount))
+ release(kref);
}
EXPORT_SYMBOL(kref_init);
}
EXPORT_SYMBOL(kref_init);