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 <hch@lst.de>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
index 2e65aacfa116200d089a1dad6142191f18095c79..02df69a8ee3c0965babb6e457ec3e3c6d1256892 100644 (file)
--- a/kernel/power/hibernate.c
+++ b/kernel/power/hibernate.c
@@ -833,17 +833,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