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

Commit 9cc8e37b authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "kobject: Export kobject_get_unless_zero()"

parents f0117dae 608fc9d0

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.