Commit f20a9ead authored by Andrew Morton's avatar Andrew Morton Committed by Greg Kroah-Hartman
Browse files

sysfs: add proper sysfs_init() prototype 



Don't be crufty.  Mark it __must_check too.

Cc: "Randy.Dunlap" <rdunlap@xenotime.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent f86db396

fs/namespace.c

+1 −9
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <linux/acct.h>

#include <linux/capability.h>

#include <linux/module.h>

#include <linux/sysfs.h>

#include <linux/seq_file.h>

#include <linux/namespace.h>

#include <linux/namei.h>
@@ -28,15 +29,6 @@ 


extern int __init init_rootfs(void);



#ifdef CONFIG_SYSFS

extern int __init sysfs_init(void);

#else

static inline int sysfs_init(void)

{

	return 0;

}

#endif



/* spinlock for vfsmount related operations, inplace of dcache_lock */

__cacheline_aligned_in_smp DEFINE_SPINLOCK(vfsmount_lock);

include/linux/sysfs.h

+7 −0
Original line number Diff line number Diff line
@@ -123,6 +123,8 @@ int __must_check sysfs_create_group(struct kobject *, 
void sysfs_remove_group(struct kobject *, const struct attribute_group *);

void sysfs_notify(struct kobject * k, char *dir, char *attr);



extern int __must_check sysfs_init(void);



#else /* CONFIG_SYSFS */



static inline int sysfs_create_dir(struct kobject * k)
@@ -194,6 +196,11 @@ static inline void sysfs_notify(struct kobject * k, char *dir, char *attr) 
{

}



static inline int __must_check sysfs_init(void)

{

	return 0;

}



#endif /* CONFIG_SYSFS */



#endif /* _SYSFS_H_ */