From: Sebastian Capella <sebastian.capella@linaro.org> To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-doc@lists.infradead.org, linux-pm@vger.kernel.org, linaro-dev@lists.linaro.org Cc: Sebastian Capella <sebastian.capella@linaro.org>, Len Brown <len.brown@intel.com>, Pavel Machek <pavel@ucw.cz>, "Rafael J. Wysocki" <rjw@sisk.pl> Subject: [PATCH v2 RFT 1/2] PM / Hibernate: use name_to_dev_t to parse resume Date: Tue, 27 Aug 2013 18:13:56 -0700 [thread overview] Message-ID: <1377652437-2379-2-git-send-email-sebastian.capella@linaro.org> (raw) In-Reply-To: <1377652437-2379-1-git-send-email-sebastian.capella@linaro.org> 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: Len Brown <len.brown@intel.com> Cc: Pavel Machek <pavel@ucw.cz> Cc: "Rafael J. Wysocki" <rjw@sisk.pl> --- kernel/power/hibernate.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c index b26f5f1..8ba8719 100644 --- a/kernel/power/hibernate.c +++ b/kernel/power/hibernate.c @@ -971,15 +971,23 @@ 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; + int len = n; + char *devcpy; - if (sscanf(buf, "%u:%u", &maj, &min) != 2) - goto out; + if (buf[len-1] == '\n') + len--; + + devcpy = kstrndup(buf, len, GFP_KERNEL); + + if (devcpy == NULL) + return -ENOMEM; + + res = name_to_dev_t(devcpy); + kfree(devcpy); - res = MKDEV(maj,min); - if (maj != MAJOR(res) || min != MINOR(res)) + if (res == 0) goto out; lock_system_sleep(); -- 1.7.9.5
WARNING: multiple messages have this Message-ID (diff)
From: sebastian.capella@linaro.org (Sebastian Capella) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 RFT 1/2] PM / Hibernate: use name_to_dev_t to parse resume Date: Tue, 27 Aug 2013 18:13:56 -0700 [thread overview] Message-ID: <1377652437-2379-2-git-send-email-sebastian.capella@linaro.org> (raw) In-Reply-To: <1377652437-2379-1-git-send-email-sebastian.capella@linaro.org> 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: Len Brown <len.brown@intel.com> Cc: Pavel Machek <pavel@ucw.cz> Cc: "Rafael J. Wysocki" <rjw@sisk.pl> --- kernel/power/hibernate.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c index b26f5f1..8ba8719 100644 --- a/kernel/power/hibernate.c +++ b/kernel/power/hibernate.c @@ -971,15 +971,23 @@ 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; + int len = n; + char *devcpy; - if (sscanf(buf, "%u:%u", &maj, &min) != 2) - goto out; + if (buf[len-1] == '\n') + len--; + + devcpy = kstrndup(buf, len, GFP_KERNEL); + + if (devcpy == NULL) + return -ENOMEM; + + res = name_to_dev_t(devcpy); + kfree(devcpy); - res = MKDEV(maj,min); - if (maj != MAJOR(res) || min != MINOR(res)) + if (res == 0) goto out; lock_system_sleep(); -- 1.7.9.5
next prev parent reply other threads:[~2013-08-28 1:14 UTC|newest] Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top 2013-08-28 1:13 [PATCH v2 RFT 0/2] PM / Hibernate: sysfs resume Sebastian Capella 2013-08-28 1:13 ` Sebastian Capella 2013-08-28 1:13 ` Sebastian Capella [this message] 2013-08-28 1:13 ` [PATCH v2 RFT 1/2] PM / Hibernate: use name_to_dev_t to parse resume Sebastian Capella 2013-08-28 1:13 ` [PATCH v2 RFT 2/2] PM / Hibernate: add section for resume options Sebastian Capella 2013-08-28 1:13 ` Sebastian Capella 2013-09-05 12:25 ` Pavel Machek 2013-09-05 12:25 ` Pavel Machek
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1377652437-2379-2-git-send-email-sebastian.capella@linaro.org \ --to=sebastian.capella@linaro.org \ --cc=len.brown@intel.com \ --cc=linaro-dev@lists.linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-doc@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-pm@vger.kernel.org \ --cc=pavel@ucw.cz \ --cc=rjw@sisk.pl \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.