From: Sebastian Capella <sebastian.capella@linaro.org>
To: linux-kernel@vger.kernel.org, linux-mm@kvack.org,
linux-pm@vger.kernel.org, linaro-kernel@lists.linaro.org,
patches@linaro.org
Cc: Sebastian Capella <sebastian.capella@linaro.org>,
Pavel Machek <pavel@ucw.cz>, Len Brown <len.brown@intel.com>,
"Rafael J. Wysocki" <rjw@sisk.pl>
Subject: [PATCH v4 2/2] PM / Hibernate: use name_to_dev_t to parse resume
Date: Wed, 29 Jan 2014 15:48:24 -0800 [thread overview]
Message-ID: <1391039304-3172-3-git-send-email-sebastian.capella@linaro.org> (raw)
In-Reply-To: <1391039304-3172-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: Pavel Machek <pavel@ucw.cz>
Cc: Len Brown <len.brown@intel.com>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
---
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 37170d4..b4a3e0b 100644
--- a/kernel/power/hibernate.c
+++ b/kernel/power/hibernate.c
@@ -973,26 +973,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 = kstrimdup(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();
- printk(KERN_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();
+ printk(KERN_INFO "PM: Starting manual resume from disk\n");
+ noresume = 0;
+ software_resume();
+ } else {
+ n = -EINVAL;
+ }
+
+ kfree(name);
+ return n;
}
power_attr(resume);
--
1.7.9.5
next prev parent reply other threads:[~2014-01-29 23:49 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-29 23:48 [PATCH v4 0/2] PM / Hibernate: sysfs resume Sebastian Capella
2014-01-29 23:48 ` [PATCH v4 1/2] mm: add kstrimdup function Sebastian Capella
2014-01-30 0:58 ` Mikulas Patocka
2014-01-30 1:02 ` Mikulas Patocka
2014-01-30 1:24 ` Joe Perches
2014-01-30 3:41 ` Sebastian Capella
2014-01-30 3:50 ` Joe Perches
2014-01-31 10:32 ` Pavel Machek
2014-01-31 10:46 ` David Rientjes
2014-01-31 12:24 ` Pavel Machek
2014-01-31 20:00 ` Sebastian Capella
2014-01-29 23:48 ` Sebastian Capella [this message]
2014-01-30 18:01 ` [PATCH v4 2/2] PM / Hibernate: use name_to_dev_t to parse resume 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=1391039304-3172-3-git-send-email-sebastian.capella@linaro.org \
--to=sebastian.capella@linaro.org \
--cc=len.brown@intel.com \
--cc=linaro-kernel@lists.linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-pm@vger.kernel.org \
--cc=patches@linaro.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).