From: Christoph Hellwig Date: Fri, 25 Sep 2020 16:14:47 +0000 (+0200) Subject: PM: hibernate: remove the bogus call to get_gendisk() in software_resume() X-Git-Tag: v4.19.154~37 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e8db1c3496ae7031dc2048e927226399970a5fdb;p=users%2Fdwmw2%2Flinux.git PM: hibernate: remove the bogus call to get_gendisk() in software_resume() [ Upstream commit 428805c0c5e76ef643b1fbc893edfb636b3d8aef ] 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 2df83fa4bce421f ("PM / Hibernate: Use get_gendisk to verify partition if resume_file is integer format") Signed-off-by: Christoph Hellwig Signed-off-by: Rafael J. Wysocki Signed-off-by: Sasha Levin --- diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c index 537a2a3c1dea2..28db51274ed0e 100644 --- a/kernel/power/hibernate.c +++ b/kernel/power/hibernate.c @@ -842,17 +842,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