Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 608fc9d0 authored Mar 23, 2017 by Jan Kara Committed by Gerrit - the friendly Code Review server Feb 28, 2018

kobject: Export kobject_get_unless_zero()



Make the function available for outside use and fortify it against NULL
kobject.

Change-Id: I76dc2a49293ce967309a882b5067bd85b8fc828e
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>
Git-commit: c70c176ff8c3ff0ac6ef9a831cd591ea9a66bd1a
Git-repo: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git


Signed-off-by: Ritesh Harjani <riteshh@codeaurora.org>

parent 90b65ff2

include/linux/kobject.h

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -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 int __must_check kobject_move(struct kobject , struct kobject );

	extern struct kobject kobject_get(struct kobject kobj);		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 void kobject_put(struct kobject *kobj);

	extern const void kobject_namespace(struct kobject kobj);		extern const void kobject_namespace(struct kobject kobj);

lib/kobject.c

+4 −1

Original line number	Original line	Diff line number	Diff line
	@@ -601,12 +601,15 @@ struct kobject kobject_get(struct kobject kobj)
	}		}
	EXPORT_SYMBOL(kobject_get);		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))		if (!kref_get_unless_zero(&kobj->kref))
	kobj = NULL;		kobj = NULL;
	return kobj;		return kobj;
	}		}
			EXPORT_SYMBOL(kobject_get_unless_zero);

	/*		/*
	* kobject_cleanup - free kobject resources.		* kobject_cleanup - free kobject resources.