Commit 2d864e41 authored by Anatol Pomozov's avatar Anatol Pomozov Committed by Linus Torvalds

kref: minor cleanup

 - make warning smp-safe
 - result of atomic _unless_zero functions should be checked by caller
   to avoid use-after-free error
 - trivial whitespace fix.

Link: https://lkml.org/lkml/2013/4/12/391

Tested: compile x86, boot machine and run xfstests
Signed-off-by: default avatarAnatol Pomozov <anatol.pomozov@gmail.com>
[ Removed line-break, changed to use WARN_ON_ONCE()  - Linus ]
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 292088ee
...@@ -39,8 +39,11 @@ static inline void kref_init(struct kref *kref) ...@@ -39,8 +39,11 @@ static inline void kref_init(struct kref *kref)
*/ */
static inline void kref_get(struct kref *kref) static inline void kref_get(struct kref *kref)
{ {
WARN_ON(!atomic_read(&kref->refcount)); /* If refcount was 0 before incrementing then we have a race
atomic_inc(&kref->refcount); * condition when this kref is freeing by some other thread right now.
* In this case one should use kref_get_unless_zero()
*/
WARN_ON_ONCE(atomic_inc_return(&kref->refcount) < 2);
} }
/** /**
...@@ -100,7 +103,7 @@ static inline int kref_put_mutex(struct kref *kref, ...@@ -100,7 +103,7 @@ static inline int kref_put_mutex(struct kref *kref,
struct mutex *lock) struct mutex *lock)
{ {
WARN_ON(release == NULL); WARN_ON(release == NULL);
if (unlikely(!atomic_add_unless(&kref->refcount, -1, 1))) { if (unlikely(!atomic_add_unless(&kref->refcount, -1, 1))) {
mutex_lock(lock); mutex_lock(lock);
if (unlikely(!atomic_dec_and_test(&kref->refcount))) { if (unlikely(!atomic_dec_and_test(&kref->refcount))) {
mutex_unlock(lock); mutex_unlock(lock);
......
...@@ -529,7 +529,7 @@ struct kobject *kobject_get(struct kobject *kobj) ...@@ -529,7 +529,7 @@ struct kobject *kobject_get(struct kobject *kobj)
return kobj; return kobj;
} }
static struct kobject *kobject_get_unless_zero(struct kobject *kobj) static struct kobject * __must_check kobject_get_unless_zero(struct kobject *kobj)
{ {
if (!kref_get_unless_zero(&kobj->kref)) if (!kref_get_unless_zero(&kobj->kref))
kobj = NULL; kobj = NULL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment