Commit c70c176f authored by Jan Kara's avatar Jan Kara Committed by Jens Axboe
Browse files

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: default avatarBart Van Assche <bart.vanassche@sandisk.com>
Acked-by: default avatarTejun Heo <tj@kernel.org>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent f759741d

include/linux/kobject.h

+2 −0
Original line number 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 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);

lib/kobject.c

+4 −1
Original line number Diff line number Diff line
@@ -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.

CRA Git | Maintained and supported by SUSTech CRA and CCSE