Hi!

> 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...@rjwysocki.net>

Acked-by: Pavel Machek <pa...@ucw.cz>

> @@ -972,16 +972,20 @@ 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 *name;
>  
> -     if (sscanf(buf, "%u:%u", &maj, &min) != 2)
> -             goto out;
> +     if (len && buf[len-1] == '\n')
> +             len--;
> +     name = kstrndup(buf, len, GFP_KERNEL);
> +     if (!name)
> +             return -ENOMEM;

And yes, it seems to do right thing even if "\n" is passed to it.

> -     res = MKDEV(maj,min);
> -     if (maj != MAJOR(res) || min != MINOR(res))
> -             goto out;
> +     res = name_to_dev_t(name);
> +     kfree(name);

-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) 
http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
--
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/

Reply via email to