const: struct quota_format_ops

[safe/jmp/linux-2.6] / kernel / ksysfs.c

diff --git a/kernel/ksysfs.c b/kernel/ksysfs.c
index cf02d4b..528dd78 100644 (file)
--- a/kernel/ksysfs.c
+++ b/kernel/ksysfs.c
@@ -14,33 +14,38 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/kexec.h>
+#include <linux/profile.h>
 #include <linux/sched.h>
 
 #define KERNEL_ATTR_RO(_name) \
-static struct subsys_attribute _name##_attr = __ATTR_RO(_name)
+static struct kobj_attribute _name##_attr = __ATTR_RO(_name)
 
 #define KERNEL_ATTR_RW(_name) \
-static struct subsys_attribute _name##_attr = \
+static struct kobj_attribute _name##_attr = \
        __ATTR(_name, 0644, _name##_show, _name##_store)
 
-#if defined(CONFIG_HOTPLUG) && defined(CONFIG_NET)
+#if defined(CONFIG_HOTPLUG)
 /* current uevent sequence number */
-static ssize_t uevent_seqnum_show(struct kset *kset, char *page)
+static ssize_t uevent_seqnum_show(struct kobject *kobj,
+                                 struct kobj_attribute *attr, char *buf)
 {
-       return sprintf(page, "%llu\n", (unsigned long long)uevent_seqnum);
+       return sprintf(buf, "%llu\n", (unsigned long long)uevent_seqnum);
 }
 KERNEL_ATTR_RO(uevent_seqnum);
 
 /* uevent helper program, used during early boo */
-static ssize_t uevent_helper_show(struct kset *kset, char *page)
+static ssize_t uevent_helper_show(struct kobject *kobj,
+                                 struct kobj_attribute *attr, char *buf)
 {
-       return sprintf(page, "%s\n", uevent_helper);
+       return sprintf(buf, "%s\n", uevent_helper);
 }
-static ssize_t uevent_helper_store(struct kset *kset, const char *page, size_t count)
+static ssize_t uevent_helper_store(struct kobject *kobj,
+                                  struct kobj_attribute *attr,
+                                  const char *buf, size_t count)
 {
        if (count+1 > UEVENT_HELPER_PATH_LEN)
                return -ENOENT;
-       memcpy(uevent_helper, page, count);
+       memcpy(uevent_helper, buf, count);
        uevent_helper[count] = '\0';
        if (count && uevent_helper[count-1] == '\n')
                uevent_helper[count-1] = '\0';
@@ -49,22 +54,56 @@ static ssize_t uevent_helper_store(struct kset *kset, const char *page, size_t c
 KERNEL_ATTR_RW(uevent_helper);
 #endif
 
+#ifdef CONFIG_PROFILING
+static ssize_t profiling_show(struct kobject *kobj,
+                                 struct kobj_attribute *attr, char *buf)
+{
+       return sprintf(buf, "%d\n", prof_on);
+}
+static ssize_t profiling_store(struct kobject *kobj,
+                                  struct kobj_attribute *attr,
+                                  const char *buf, size_t count)
+{
+       int ret;
+
+       if (prof_on)
+               return -EEXIST;
+       /*
+        * This eventually calls into get_option() which
+        * has a ton of callers and is not const.  It is
+        * easiest to cast it away here.
+        */
+       profile_setup((char *)buf);
+       ret = profile_init();
+       if (ret)
+               return ret;
+       ret = create_proc_profile();
+       if (ret)
+               return ret;
+       return count;
+}
+KERNEL_ATTR_RW(profiling);
+#endif
+
 #ifdef CONFIG_KEXEC
-static ssize_t kexec_loaded_show(struct kset *kset, char *page)
+static ssize_t kexec_loaded_show(struct kobject *kobj,
+                                struct kobj_attribute *attr, char *buf)
 {
-       return sprintf(page, "%d\n", !!kexec_image);
+       return sprintf(buf, "%d\n", !!kexec_image);
 }
 KERNEL_ATTR_RO(kexec_loaded);
 
-static ssize_t kexec_crash_loaded_show(struct kset *kset, char *page)
+static ssize_t kexec_crash_loaded_show(struct kobject *kobj,
+                                      struct kobj_attribute *attr, char *buf)
 {
-       return sprintf(page, "%d\n", !!kexec_crash_image);
+       return sprintf(buf, "%d\n", !!kexec_crash_image);
 }
 KERNEL_ATTR_RO(kexec_crash_loaded);
 
-static ssize_t vmcoreinfo_show(struct kset *kset, char *page)
+static ssize_t vmcoreinfo_show(struct kobject *kobj,
+                              struct kobj_attribute *attr, char *buf)
 {
-       return sprintf(page, "%lx %x\n",
+       return sprintf(buf, "%lx %x\n",
                       paddr_vmcoreinfo_note(),
                       (unsigned int)vmcoreinfo_max_size);
 }
@@ -94,14 +133,17 @@ static struct bin_attribute notes_attr = {
        .read = &notes_read,
 };
 
-struct kset *kernel_kset;
-EXPORT_SYMBOL_GPL(kernel_kset);
+struct kobject *kernel_kobj;
+EXPORT_SYMBOL_GPL(kernel_kobj);
 
 static struct attribute * kernel_attrs[] = {
-#if defined(CONFIG_HOTPLUG) && defined(CONFIG_NET)
+#if defined(CONFIG_HOTPLUG)
        &uevent_seqnum_attr.attr,
        &uevent_helper_attr.attr,
 #endif
+#ifdef CONFIG_PROFILING
+       &profiling_attr.attr,
+#endif
 #ifdef CONFIG_KEXEC
        &kexec_loaded_attr.attr,
        &kexec_crash_loaded_attr.attr,
@@ -118,27 +160,24 @@ static int __init ksysfs_init(void)
 {
        int error;
 
-       kernel_kset = kset_create_and_add("kernel", NULL, NULL);
-       if (!kernel_kset) {
+       kernel_kobj = kobject_create_and_add("kernel", NULL);
+       if (!kernel_kobj) {
                error = -ENOMEM;
                goto exit;
        }
-       error = sysfs_create_group(&kernel_kset->kobj, &kernel_attr_group);
+       error = sysfs_create_group(kernel_kobj, &kernel_attr_group);
        if (error)
                goto kset_exit;
 
        if (notes_size > 0) {
                notes_attr.size = notes_size;
-               error = sysfs_create_bin_file(&kernel_kset->kobj, &notes_attr);
+               error = sysfs_create_bin_file(kernel_kobj, &notes_attr);
                if (error)
                        goto group_exit;
        }
 
-       /*
-        * Create "/sys/kernel/uids" directory and corresponding root user's
-        * directory under it.
-        */
-       error = uids_kobject_init();
+       /* create the /sys/kernel/uids/ directory */
+       error = uids_sysfs_init();
        if (error)
                goto notes_exit;
 
@@ -146,11 +185,11 @@ static int __init ksysfs_init(void)
 
 notes_exit:
        if (notes_size > 0)
-               sysfs_remove_bin_file(&kernel_kset->kobj, &notes_attr);
+               sysfs_remove_bin_file(kernel_kobj, &notes_attr);
 group_exit:
-       sysfs_remove_group(&kernel_kset->kobj, &kernel_attr_group);
+       sysfs_remove_group(kernel_kobj, &kernel_attr_group);
 kset_exit:
-       kset_unregister(kernel_kset);
+       kobject_put(kernel_kobj);
 exit:
        return error;
 }