From cbd5933314798ad22bbf7dded67d3d81a737397f Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Fri, 11 Nov 2005 04:58:04 +0100 Subject: [PATCH] --- yaml --- r: 16199 b: refs/heads/master c: 0f76e5acf9dc788e664056dda1e461f0bec93948 h: refs/heads/master i: 16197: 50bce50a9e727fed7c660cb279782765500573df 16195: 57c06fc2f3b66731520fdde8b68c56aadaef5df1 16191: a68d7bcf665f1ad0b0bea7caaa8d282b8388dcd0 v: v3 --- [refs] | 2 +- trunk/kernel/ksysfs.c | 25 ++++++++++++++++++++++--- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index e6121e901b5c..c469bd4b0c1e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0296b2281352e4794e174b393c37f131502e09f0 +refs/heads/master: 0f76e5acf9dc788e664056dda1e461f0bec93948 diff --git a/trunk/kernel/ksysfs.c b/trunk/kernel/ksysfs.c index 015fb69ad94d..e975a76a9d5b 100644 --- a/trunk/kernel/ksysfs.c +++ b/trunk/kernel/ksysfs.c @@ -23,11 +23,29 @@ static struct subsys_attribute _name##_attr = \ __ATTR(_name, 0644, _name##_show, _name##_store) #ifdef CONFIG_HOTPLUG -static ssize_t hotplug_seqnum_show(struct subsystem *subsys, char *page) +/* current uevent sequence number */ +static ssize_t uevent_seqnum_show(struct subsystem *subsys, char *page) { return sprintf(page, "%llu\n", (unsigned long long)hotplug_seqnum); } -KERNEL_ATTR_RO(hotplug_seqnum); +KERNEL_ATTR_RO(uevent_seqnum); + +/* uevent helper program, used during early boo */ +static ssize_t uevent_helper_show(struct subsystem *subsys, char *page) +{ + return sprintf(page, "%s\n", hotplug_path); +} +static ssize_t uevent_helper_store(struct subsystem *subsys, const char *page, size_t count) +{ + if (count+1 > HOTPLUG_PATH_LEN) + return -ENOENT; + memcpy(hotplug_path, page, count); + hotplug_path[count] = '\0'; + if (count && hotplug_path[count-1] == '\n') + hotplug_path[count-1] = '\0'; + return count; +} +KERNEL_ATTR_RW(uevent_helper); #endif #ifdef CONFIG_KEXEC @@ -45,7 +63,8 @@ EXPORT_SYMBOL_GPL(kernel_subsys); static struct attribute * kernel_attrs[] = { #ifdef CONFIG_HOTPLUG - &hotplug_seqnum_attr.attr, + &uevent_seqnum_attr.attr, + &uevent_helper_attr.attr, #endif #ifdef CONFIG_KEXEC &crash_notes_attr.attr,