summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2006-08-14 22:43:23 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2006-09-25 21:08:39 -0700
commitf20a9ead0d005fbeeae3fc21a96f9bf197ac1c1c (patch)
treeb8fb72701b5917d03b6fe122a1719e1cd608b4d9
parentf86db396ff455ed586751d21816a1ebd431264e5 (diff)
downloadlinux-3.10-f20a9ead0d005fbeeae3fc21a96f9bf197ac1c1c.tar.gz
linux-3.10-f20a9ead0d005fbeeae3fc21a96f9bf197ac1c1c.tar.bz2
linux-3.10-f20a9ead0d005fbeeae3fc21a96f9bf197ac1c1c.zip
sysfs: add proper sysfs_init() prototype
Don't be crufty. Mark it __must_check too. Cc: "Randy.Dunlap" <rdunlap@xenotime.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--fs/namespace.c10
-rw-r--r--include/linux/sysfs.h7
2 files changed, 8 insertions, 9 deletions
diff --git a/fs/namespace.c b/fs/namespace.c
index fa7ed6a9fc2..36d18085813 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -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);
diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h
index 02ad790921f..6d5c43d31de 100644
--- a/include/linux/sysfs.h
+++ b/include/linux/sysfs.h
@@ -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_ */