mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-01 06:33:07 +00:00
PM: hibernate: remove the bogus call to get_gendisk() in software_resume()
get_gendisk grabs a reference on the disk and file operation, so this
code will leak both of them while having absolutely no use for the
gendisk itself.
This effectively reverts commit 2df83fa4bc
("PM / Hibernate: Use
get_gendisk to verify partition if resume_file is integer format")
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
parent
55c4478a8f
commit
428805c0c5
1 changed files with 0 additions and 11 deletions
|
@ -948,17 +948,6 @@ static int software_resume(void)
|
||||||
|
|
||||||
/* Check if the device is there */
|
/* Check if the device is there */
|
||||||
swsusp_resume_device = name_to_dev_t(resume_file);
|
swsusp_resume_device = name_to_dev_t(resume_file);
|
||||||
|
|
||||||
/*
|
|
||||||
* name_to_dev_t is ineffective to verify parition if resume_file is in
|
|
||||||
* integer format. (e.g. major:minor)
|
|
||||||
*/
|
|
||||||
if (isdigit(resume_file[0]) && resume_wait) {
|
|
||||||
int partno;
|
|
||||||
while (!get_gendisk(swsusp_resume_device, &partno))
|
|
||||||
msleep(10);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!swsusp_resume_device) {
|
if (!swsusp_resume_device) {
|
||||||
/*
|
/*
|
||||||
* Some device discovery might still be in progress; we need
|
* Some device discovery might still be in progress; we need
|
||||||
|
|
Loading…
Reference in a new issue