lkml.org 
[lkml]   [2020]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.8 563/633] PM: hibernate: remove the bogus call to get_gendisk() in software_resume()
    Date
    From: Christoph Hellwig <hch@lst.de>

    [ 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>
    ---
    kernel/power/hibernate.c | 11 -----------
    1 file changed, 11 deletions(-)

    diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
    index 02ec716a49271..0e60e10ed66a3 100644
    --- a/kernel/power/hibernate.c
    +++ b/kernel/power/hibernate.c
    @@ -851,17 +851,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.25.1


    \
     
     \ /
      Last update: 2020-10-27 17:50    [W:4.120 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site