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=-12.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,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 06CE3C4346B for ; Mon, 21 Sep 2020 07:20:34 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 98D5C2067D for ; Mon, 21 Sep 2020 07:20:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="P+xH+vZ5" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 98D5C2067D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 84C2590002F; Mon, 21 Sep 2020 03:20:27 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7FA85900029; Mon, 21 Sep 2020 03:20:27 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6EAC890002F; Mon, 21 Sep 2020 03:20:27 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0252.hostedemail.com [216.40.44.252]) by kanga.kvack.org (Postfix) with ESMTP id 4D6F9900029 for ; Mon, 21 Sep 2020 03:20:27 -0400 (EDT) Received: from smtpin16.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 0DDFC181AEF09 for ; Mon, 21 Sep 2020 07:20:27 +0000 (UTC) X-FDA: 77286220494.16.verse98_0f0853a27143 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin16.hostedemail.com (Postfix) with ESMTP id E20D9100E691F for ; Mon, 21 Sep 2020 07:20:26 +0000 (UTC) X-HE-Tag: verse98_0f0853a27143 X-Filterd-Recvd-Size: 3213 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf31.hostedemail.com (Postfix) with ESMTP for ; Mon, 21 Sep 2020 07:20:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=blabZPmWXgG0cxcX0iPoG2CU0yB/dn2E6XMr7wtvOlU=; b=P+xH+vZ5WozDW/mPdPOoeSIebG XZS2jbwOYrOnTthQk0Uhm2SN87yRyDUn+1hDAtJuRjjVe/XicpMadZaTTfDzItsqRxP8o2qV2xw+J wgYD2nLuTxeNFRAUjWM1VtY3PaSm5zVdGYXpcad8hFndoD1AZSe2iSlkKP1/tdil7vhDgqkhDxwQS E4kZzfmz7B2OoGgbvaA3W/YOA3nGsZTkMQbjCf6TCyC+pOZeLaPcFY/tOyz9SKH45tfIIXYTwB611 bGDDyetv66m9+BQacOd9O8B2x2ftPjyj+cyfGSSLbX1LbAlrCntf+ngFdzLp9viVESfnCMpXnZkw+ bqJgUGMA==; Received: from p4fdb0c34.dip0.t-ipconnect.de ([79.219.12.52] helo=localhost) by casper.infradead.org with esmtpsa (Exim 4.92.3 #3 (Red Hat Linux)) id 1kKG7I-0003Hv-7w; Mon, 21 Sep 2020 07:20:04 +0000 From: Christoph Hellwig To: Jens Axboe Cc: Josef Bacik , Minchan Kim , Stefan Haberland , Jan Hoeppner , Joseph Qi , "Rafael J. Wysocki" , Pavel Machek , Len Brown , Andrew Morton , linux-kernel@vger.kernel.org, nbd@other.debian.org, linux-ide@vger.kernel.org, linux-s390@vger.kernel.org, linux-fsdevel@vger.kernel.org, ocfs2-devel@oss.oracle.com, linux-pm@vger.kernel.org, linux-mm@kvack.org, linux-block@vger.kernel.org, "Rafael J . Wysocki" Subject: [PATCH 13/14] PM: mm: cleanup swsusp_swap_check Date: Mon, 21 Sep 2020 09:19:57 +0200 Message-Id: <20200921071958.307589-14-hch@lst.de> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200921071958.307589-1-hch@lst.de> References: <20200921071958.307589-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by casper.infradead.org. See http://www.infradead.org/rpr.html Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Use blkdev_get_by_dev instead of bdget + blkdev_get. Signed-off-by: Christoph Hellwig Acked-by: Rafael J. Wysocki --- kernel/power/swap.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/kernel/power/swap.c b/kernel/power/swap.c index 9d3ffbfe08dbf6..71385bedcc3a49 100644 --- a/kernel/power/swap.c +++ b/kernel/power/swap.c @@ -343,12 +343,10 @@ static int swsusp_swap_check(void) return res; root_swap =3D res; =20 - hib_resume_bdev =3D bdget(swsusp_resume_device); - if (!hib_resume_bdev) - return -ENOMEM; - res =3D blkdev_get(hib_resume_bdev, FMODE_WRITE, NULL); - if (res) - return res; + hib_resume_bdev =3D blkdev_get_by_dev(swsusp_resume_device, FMODE_WRITE= , + NULL); + if (IS_ERR(hib_resume_bdev)) + return PTR_ERR(hib_resume_bdev); =20 res =3D set_blocksize(hib_resume_bdev, PAGE_SIZE); if (res < 0) --=20 2.28.0