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 2302BC4346A for ; Mon, 21 Sep 2020 07:20:16 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 99C5520874 for ; Mon, 21 Sep 2020 07:20:15 +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="ES2D2BfG" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 99C5520874 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 1BBBC900026; Mon, 21 Sep 2020 03:20:14 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 19174900023; Mon, 21 Sep 2020 03:20:14 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0A93E900026; Mon, 21 Sep 2020 03:20:14 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0201.hostedemail.com [216.40.44.201]) by kanga.kvack.org (Postfix) with ESMTP id EA9DF900023 for ; Mon, 21 Sep 2020 03:20:13 -0400 (EDT) Received: from smtpin26.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id A66133628 for ; Mon, 21 Sep 2020 07:20:13 +0000 (UTC) X-FDA: 77286219906.26.feast48_590784227143 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin26.hostedemail.com (Postfix) with ESMTP id 80DBF1804B654 for ; Mon, 21 Sep 2020 07:20:13 +0000 (UTC) X-HE-Tag: feast48_590784227143 X-Filterd-Recvd-Size: 3001 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf30.hostedemail.com (Postfix) with ESMTP for ; Mon, 21 Sep 2020 07:20:13 +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=rH7cSa9DL5os5jQC9jA3JdyjaAHSLlkPqftBlBnCr7E=; b=ES2D2BfGiz1kTREN1Zw1aEiUML yN3tE0P5XRnER56mCx5PkI30Q59VGyQrEh5EPC/UmarLTKWmViIwsDGAAovnSV/BAkMyPQC5yGuxl ENgWGtDJ6bDGN6rME7pQzGngkqzTaL2xxFlhhz9HJX7KfABNGAiqYtT6oCd4ti7TAgwVq4xw4YgEY 4IolEoVibJpRHqIQjemg+UD9WQIoeSYC6qIxNvGZYtNuFC02EX6qJM4q8oi4PthhKKrYRL7Ps62O+ MLBqEGi7Hq88Q9whqgktd1trmTObSIXUPvVu/znwzj3rjz06ExzSrAX5ni2VqijOLmMicWfwPbORl BaJQKhbg==; 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 1kKG7E-0003Ff-CG; Mon, 21 Sep 2020 07:20:00 +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 Subject: [PATCH 10/14] mm: cleanup claim_swapfile Date: Mon, 21 Sep 2020 09:19:54 +0200 Message-Id: <20200921071958.307589-11-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 bdgrab + blkdev_get. Signed-off-by: Christoph Hellwig --- mm/swapfile.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mm/swapfile.c b/mm/swapfile.c index 12f59e641b5e29..7438c4affc75fa 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -2920,10 +2920,10 @@ static int claim_swapfile(struct swap_info_struct= *p, struct inode *inode) int error; =20 if (S_ISBLK(inode->i_mode)) { - p->bdev =3D bdgrab(I_BDEV(inode)); - error =3D blkdev_get(p->bdev, + p->bdev =3D blkdev_get_by_dev(inode->i_rdev, FMODE_READ | FMODE_WRITE | FMODE_EXCL, p); - if (error < 0) { + if (IS_ERR(p->bdev)) { + error =3D PTR_ERR(p->bdev); p->bdev =3D NULL; return error; } --=20 2.28.0