From patchwork Fri Jan 31 00:54:14 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Capella X-Patchwork-Id: 3559901 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 067DE9F39E for ; Fri, 31 Jan 2014 00:54:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2CC57201D3 for ; Fri, 31 Jan 2014 00:54:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4C199201CE for ; Fri, 31 Jan 2014 00:54:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932139AbaAaAya (ORCPT ); Thu, 30 Jan 2014 19:54:30 -0500 Received: from mail-pa0-f44.google.com ([209.85.220.44]:60943 "EHLO mail-pa0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932132AbaAaAy2 (ORCPT ); Thu, 30 Jan 2014 19:54:28 -0500 Received: by mail-pa0-f44.google.com with SMTP id kq14so3803044pab.31 for ; Thu, 30 Jan 2014 16:54:28 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=cxBrh69R6UCKnGtEGU227iGM+Z916ITMZJiHqKWa3lQ=; b=BTGM72/Rn37TabPbOPHFjSdFh+6NgGDXq9tg2YXog4rrGp9zAzDu0FBATsm9LNzhtz buHoe2rPZ5qDwGH3/OAipIM6ZySXQ35bKQHFADbhNJKSG0hDfZ0VDeGFKCmQJZxtKoeT jxhERkcuSWNtORF6WLJcITopZi+6IN8E97n+p4PIdUt/0UEK0mhDn1VV1+XA2c3ObNli QWOznYyjuEasPexcJ1Pl/iYa8UvslNQYLhNBfX8VpWgNCTASu/Wu4Lao5lon/6YOb0oU jN402owpv/sCKmNH1KGWrhAMWFq9ANrgXj4gWNVgupUOwdrAzO+s7afj1MxF03vulNFs XS2g== X-Gm-Message-State: ALoCoQnBn2lYYWYvN8cqLMI4WSPPLrmJNWIXOoELvwEK6NaA7yqvGTG7ORpkZwL0Zm64h9b3Bj6+ X-Received: by 10.68.66.33 with SMTP id c1mr17806398pbt.118.1391129668142; Thu, 30 Jan 2014 16:54:28 -0800 (PST) Received: from localhost (cpe-76-93-135-111.san.res.rr.com. [76.93.135.111]) by mx.google.com with ESMTPSA id e6sm21635868pbg.4.2014.01.30.16.54.25 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 30 Jan 2014 16:54:27 -0800 (PST) From: Sebastian Capella 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 , Len Brown , "Rafael J. Wysocki" Subject: [PATCH v6 2/2] PM / Hibernate: use name_to_dev_t to parse resume Date: Thu, 30 Jan 2014 16:54:14 -0800 Message-Id: <1391129654-12854-3-git-send-email-sebastian.capella@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1391129654-12854-1-git-send-email-sebastian.capella@linaro.org> References: <1391129654-12854-1-git-send-email-sebastian.capella@linaro.org> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Acked-by: Pavel Machek Cc: Len Brown Cc: "Rafael J. Wysocki" --- 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 0121dab..49d7a37 100644 --- a/kernel/power/hibernate.c +++ b/kernel/power/hibernate.c @@ -972,26 +972,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);