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.cape...@linaro.org>
Cc: Len Brown <len.br...@intel.com>
Cc: Pavel Machek <pa...@ucw.cz>
Cc: "Rafael J. Wysocki" <r...@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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
