From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8BCC0C433DF for ; Sun, 18 Oct 2020 19:45:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5831F206ED for ; Sun, 18 Oct 2020 19:45:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603050306; bh=KBactvEaUAEvgP4dzWOQ7pgiFuIZ3IED/EG1+Kb8/xQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=DToWWt27L0T2dLXSeusFmZssZ+2lTzxPPWqDoN1nywrxaXttLeDBcT5Qoa/bewSDb 8UEfln9rMhKVxnQgI1pCPoGEdd0mGXGIC33DZP6p+r1bczzGa7kFeEnKCur3M86ob8 7x40Tvctk9k4JJa+XSujmndpXGiUv2EzUHAAWKYQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733312AbgJRTpF (ORCPT ); Sun, 18 Oct 2020 15:45:05 -0400 Received: from mail.kernel.org ([198.145.29.99]:36334 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730181AbgJRTXN (ORCPT ); Sun, 18 Oct 2020 15:23:13 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C3E6B222EA; Sun, 18 Oct 2020 19:23:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603048993; bh=KBactvEaUAEvgP4dzWOQ7pgiFuIZ3IED/EG1+Kb8/xQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wE/l0xLW06ZSMu3cgLyne4IlKdBPD6yf1aNpJ7DVHBs3yDKWyBEehWZ7NI+QJUO9J 3Gv0ma++I/Exn++KxHCMr7iLCgdc40ClMf3gFxY5Ljn8+MPSH30Cw3HZSos6daUBop nq2Dv6lBjX81Ufq46QYRSG+co29qt6ZWCbjfud5s= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Christoph Hellwig , "Rafael J . Wysocki" , Sasha Levin , linux-pm@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 31/80] PM: hibernate: remove the bogus call to get_gendisk() in software_resume() Date: Sun, 18 Oct 2020 15:21:42 -0400 Message-Id: <20201018192231.4054535-31-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201018192231.4054535-1-sashal@kernel.org> References: <20201018192231.4054535-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Christoph Hellwig [ 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 Signed-off-by: Rafael J. Wysocki Signed-off-by: Sasha Levin --- kernel/power/hibernate.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c index b6c5895ced36b..69c4cd472def3 100644 --- a/kernel/power/hibernate.c +++ b/kernel/power/hibernate.c @@ -839,17 +839,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