[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CAJZ5v0h8TbOZ=seE8+OqFKTRxOYK25aTXDam7Lez0VR5qnkM3Q@mail.gmail.com>
Date: Wed, 30 Sep 2020 17:45:27 +0200
From: "Rafael J. Wysocki" <rafael@...nel.org>
To: Christoph Hellwig <hch@....de>
Cc: Tejun Heo <tj@...nel.org>, Jens Axboe <axboe@...nel.dk>,
"Rafael J. Wysocki" <rjw@...ysocki.net>,
Pavel Machek <pavel@....cz>, Len Brown <len.brown@...el.com>,
Minho Ban <mhban@...sung.com>, cgroups@...r.kernel.org,
linux-block@...r.kernel.org,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
Linux PM <linux-pm@...r.kernel.org>
Subject: Re: [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@....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@....de>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@...el.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
>
Powered by blists - more mailing lists