lkml.org 
[lkml]   [2020]   [Sep]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: [PATCH 2/2] PM/hibernate: remove the bogus call to get_gendisk in software_resume
On Fri, Sep 25, 2020 at 6:15 PM Christoph Hellwig <hch@lst.de> wrote:
>
> 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>

Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

> ---
> kernel/power/hibernate.c | 11 -----------
> 1 file changed, 11 deletions(-)
>
> diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
> index e7aa57fb2fdc33..7d0b99d2e69631 100644
> --- a/kernel/power/hibernate.c
> +++ b/kernel/power/hibernate.c
> @@ -948,17 +948,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
> --
> 2.28.0
>

\
 
 \ /
  Last update: 2020-09-30 17:45    [W:0.068 / U:3.140 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site