diff options
| author | Christoph Hellwig <hch@lst.de> | 2020-09-25 18:14:47 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-10-29 09:03:09 +0100 |
| commit | 5198b6fff9a0b6bb1e77508d0025bb5f6df61cb2 (patch) | |
| tree | d58e78df08fbbe9333398ed6fe01421ff56b260a | |
| parent | 76e94ac0d60decb21059a68108f16c8d9ac0b43c (diff) | |
| download | linux-stable-5198b6fff9a0b6bb1e77508d0025bb5f6df61cb2.tar.gz linux-stable-5198b6fff9a0b6bb1e77508d0025bb5f6df61cb2.tar.bz2 linux-stable-5198b6fff9a0b6bb1e77508d0025bb5f6df61cb2.zip | |
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>
| -rw-r--r-- | kernel/power/hibernate.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c index 3124cebaec31..7d73b30c55cc 100644 --- a/kernel/power/hibernate.c +++ b/kernel/power/hibernate.c @@ -779,17 +779,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 |