Skip to content

Commit

Permalink
PM: hibernate: remove the bogus call to get_gendisk() in software_res…
Browse files Browse the repository at this point in the history
…ume()

[ Upstream commit 428805c ]

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 2df83fa ("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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
Christoph Hellwig authored and gregkh committed Oct 29, 2020
1 parent 9ff1977 commit 267edd6
Showing 1 changed file with 0 additions and 11 deletions.
11 changes: 0 additions & 11 deletions kernel/power/hibernate.c
Original file line number Diff line number Diff line change
Expand Up @@ -839,17 +839,6 @@ static int software_resume(void)

/* Check if the device is there */
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) {
/*
* Some device discovery might still be in progress; we need
Expand Down

0 comments on commit 267edd6

Please sign in to comment.