diff options
| author | Jan Kara <jack@suse.cz> | 2017-03-23 01:37:01 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2017-03-22 20:11:35 -0600 |
| commit | c70c176ff8c3ff0ac6ef9a831cd591ea9a66bd1a (patch) | |
| tree | fbeffaadd5bf1aed0daab320f797adabe8b3916a | |
| parent | f759741d9d913eb57784a94b9bca78b376fc26a9 (diff) | |
| download | linux-stable-c70c176ff8c3ff0ac6ef9a831cd591ea9a66bd1a.tar.gz linux-stable-c70c176ff8c3ff0ac6ef9a831cd591ea9a66bd1a.tar.bz2 linux-stable-c70c176ff8c3ff0ac6ef9a831cd591ea9a66bd1a.zip | |
kobject: Export kobject_get_unless_zero()
Make the function available for outside use and fortify it against NULL
kobject.
CC: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: Bart Van Assche <bart.vanassche@sandisk.com>
Acked-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Jens Axboe <axboe@fb.com>
| -rw-r--r-- | include/linux/kobject.h | 2 | ||||
| -rw-r--r-- | lib/kobject.c | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/include/linux/kobject.h b/include/linux/kobject.h index e6284591599e..ca85cb80e99a 100644 --- a/include/linux/kobject.h +++ b/include/linux/kobject.h @@ -108,6 +108,8 @@ extern int __must_check kobject_rename(struct kobject *, const char *new_name); extern int __must_check kobject_move(struct kobject *, struct kobject *); extern struct kobject *kobject_get(struct kobject *kobj); +extern struct kobject * __must_check kobject_get_unless_zero( + struct kobject *kobj); extern void kobject_put(struct kobject *kobj); extern const void *kobject_namespace(struct kobject *kobj); diff --git a/lib/kobject.c b/lib/kobject.c index 445dcaeb0f56..763d70a18941 100644 --- a/lib/kobject.c +++ b/lib/kobject.c @@ -601,12 +601,15 @@ struct kobject *kobject_get(struct kobject *kobj) } EXPORT_SYMBOL(kobject_get); -static struct kobject * __must_check kobject_get_unless_zero(struct kobject *kobj) +struct kobject * __must_check kobject_get_unless_zero(struct kobject *kobj) { + if (!kobj) + return NULL; if (!kref_get_unless_zero(&kobj->kref)) kobj = NULL; return kobj; } +EXPORT_SYMBOL(kobject_get_unless_zero); /* * kobject_cleanup - free kobject resources. |