Hi!
> 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@xxxxxx>
> ---
> 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);
> - }
I believe point of this code was to wait for resume device to appear
-- see the resume_wait condition. It should not be simply removed.
Best regards,
Pavel
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Attachment:
signature.asc
Description: PGP signature
