| Message ID | 1391546631-7715-4-git-send-email-sebastian.capella@linaro.org (mailing list archive) |
|---|---|
| State | Changes Requested, archived |
| Headers | show |
On Tuesday, February 04, 2014 12:43:51 PM Sebastian Capella wrote: > Use the name_to_dev_t call to parse the device name echo'd to > to /sys/power/resume. This imitates the method used in hibernate.c > in software_resume, and allows the resume partition to be specified > using other equivalent device formats as well. By allowing > /sys/debug/resume to accept the same syntax as the resume=device > parameter, we can parse the resume=device in the init script and > use the resume device directly from the kernel command line. > > Signed-off-by: Sebastian Capella <sebastian.capella@linaro.org> > Cc: Pavel Machek <pavel@ucw.cz> > Cc: Len Brown <len.brown@intel.com> > Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net> > --- > kernel/power/hibernate.c | 33 +++++++++++++++++---------------- > 1 file changed, 17 insertions(+), 16 deletions(-) > > diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c > index cd1e30c..3abd192 100644 > --- a/kernel/power/hibernate.c > +++ b/kernel/power/hibernate.c > @@ -970,26 +970,27 @@ static ssize_t resume_show(struct kobject *kobj, struct kobj_attribute *attr, > static ssize_t resume_store(struct kobject *kobj, struct kobj_attribute *attr, > const char *buf, size_t n) > { > - unsigned int maj, min; > dev_t res; > - int ret = -EINVAL; > + char *name = kstrdup_trimnl(buf, GFP_KERNEL); > > - if (sscanf(buf, "%u:%u", &maj, &min) != 2) > - goto out; > + if (name == NULL) What about "if (!name)"? > + return -ENOMEM; > > - res = MKDEV(maj,min); > - if (maj != MAJOR(res) || min != MINOR(res)) > - goto out; > + res = name_to_dev_t(name); > > - lock_system_sleep(); > - swsusp_resume_device = res; > - unlock_system_sleep(); > - pr_info("PM: Starting manual resume from disk\n"); > - noresume = 0; > - software_resume(); > - ret = n; > - out: > - return ret; > + if (res != 0) { What about "if (res)"? > + lock_system_sleep(); > + swsusp_resume_device = res; > + unlock_system_sleep(); > + pr_info("PM: Starting manual resume from disk\n"); > + noresume = 0; > + software_resume(); > + } else { > + n = -EINVAL; > + } > + > + kfree(name); > + return n; > } > > power_attr(resume); >
diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c index cd1e30c..3abd192 100644 --- a/kernel/power/hibernate.c +++ b/kernel/power/hibernate.c @@ -970,26 +970,27 @@ static ssize_t resume_show(struct kobject *kobj, struct kobj_attribute *attr, static ssize_t resume_store(struct kobject *kobj, struct kobj_attribute *attr, const char *buf, size_t n) { - unsigned int maj, min; dev_t res; - int ret = -EINVAL; + char *name = kstrdup_trimnl(buf, GFP_KERNEL); - if (sscanf(buf, "%u:%u", &maj, &min) != 2) - goto out; + if (name == NULL) + return -ENOMEM; - res = MKDEV(maj,min); - if (maj != MAJOR(res) || min != MINOR(res)) - goto out; + res = name_to_dev_t(name); - lock_system_sleep(); - swsusp_resume_device = res; - unlock_system_sleep(); - pr_info("PM: Starting manual resume from disk\n"); - noresume = 0; - software_resume(); - ret = n; - out: - return ret; + if (res != 0) { + lock_system_sleep(); + swsusp_resume_device = res; + unlock_system_sleep(); + pr_info("PM: Starting manual resume from disk\n"); + noresume = 0; + software_resume(); + } else { + n = -EINVAL; + } + + kfree(name); + return n; } power_attr(resume);
Use the name_to_dev_t call to parse the device name echo'd to to /sys/power/resume. This imitates the method used in hibernate.c in software_resume, and allows the resume partition to be specified using other equivalent device formats as well. By allowing /sys/debug/resume to accept the same syntax as the resume=device parameter, we can parse the resume=device in the init script and use the resume device directly from the kernel command line. Signed-off-by: Sebastian Capella <sebastian.capella@linaro.org> Cc: Pavel Machek <pavel@ucw.cz> Cc: Len Brown <len.brown@intel.com> Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net> --- kernel/power/hibernate.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-)