From: Lin Ming <ming.m.lin@intel.com>
To: linux-kernel@vger.kernel.org
Cc: linux-ide@vger.kernel.org, linux-scsi@vger.kernel.org,
linux-pm@vger.kernel.org, Alan Stern <stern@rowland.harvard.edu>,
Jeff Garzik <jgarzik@pobox.com>,
"Rafael J. Wysocki" <rjw@sisk.pl>,
James Bottomley <JBottomley@parallels.com>,
Tejun Heo <tj@kernel.org>, Huang Ying <ying.huang@intel.com>,
Zhang Rui <rui.zhang@intel.com>
Subject: [PATCH v3 4/6] [SCSI] sd: check runtime status in sd_shutdown
Date: Wed, 23 Nov 2011 15:01:24 +0800 [thread overview]
Message-ID: <1322031686-28233-5-git-send-email-ming.m.lin@intel.com> (raw)
In-Reply-To: <1322031686-28233-1-git-send-email-ming.m.lin@intel.com>
sd_shutdown is called during reboot/poweroff.
It may fail if parent device, for example, ata port, was runtime suspended.
Fix it by checking runtime status of sd.
Exit immediately if sd was runtime suspended already.
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
---
drivers/scsi/sd.c | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index fa3a591..7b3f807 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -50,6 +50,7 @@
#include <linux/string_helpers.h>
#include <linux/async.h>
#include <linux/slab.h>
+#include <linux/pm_runtime.h>
#include <asm/uaccess.h>
#include <asm/unaligned.h>
@@ -2741,6 +2742,9 @@ static void sd_shutdown(struct device *dev)
if (!sdkp)
return; /* this can happen */
+ if (pm_runtime_suspended(dev))
+ goto exit;
+
if (sdkp->WCE) {
sd_printk(KERN_NOTICE, sdkp, "Synchronizing SCSI cache\n");
sd_sync_cache(sdkp);
@@ -2751,6 +2755,7 @@ static void sd_shutdown(struct device *dev)
sd_start_stop_device(sdkp, 0);
}
+exit:
scsi_disk_put(sdkp);
}
--
1.7.2.5
next prev parent reply other threads:[~2011-11-23 7:02 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-23 7:01 [PATCH v3 0/6] ata port runtime power management support Lin Ming
2011-11-23 7:01 ` [PATCH v3 1/6] ata: make ata port as parent device of scsi host Lin Ming
2011-11-23 7:01 ` [PATCH v3 2/6] scsi: add flag to skip the runtime PM calls on the host Lin Ming
2011-11-23 7:01 ` [PATCH v3 3/6] [SCSI] runtime resume device before system suspend Lin Ming
2011-11-23 17:02 ` Alan Stern
2011-11-24 12:21 ` Lin Ming
2011-11-24 16:36 ` Alan Stern
2011-11-24 19:57 ` Tejun Heo
2011-11-24 22:54 ` Alan Stern
2011-11-24 23:01 ` Tejun Heo
2011-11-25 0:17 ` Alan Stern
2011-11-25 13:50 ` Lin Ming
2011-11-25 15:19 ` Alan Stern
2011-11-23 7:01 ` Lin Ming [this message]
2011-11-23 7:01 ` [PATCH v3 5/6] ata: add ata port system PM callbacks Lin Ming
2011-11-23 7:01 ` [PATCH v3 6/6] ata: add ata port runtime " Lin Ming
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=1322031686-28233-5-git-send-email-ming.m.lin@intel.com \
--to=ming.m.lin@intel.com \
--cc=JBottomley@parallels.com \
--cc=jgarzik@pobox.com \
--cc=linux-ide@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=rjw@sisk.pl \
--cc=rui.zhang@intel.com \
--cc=stern@rowland.harvard.edu \
--cc=tj@kernel.org \
--cc=ying.huang@intel.com \
/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).