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 27134C433E2 for ; Thu, 17 Sep 2020 17:19:32 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id A97B4221E3 for ; Thu, 17 Sep 2020 17:19:31 +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="jeRYq0Vw" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A97B4221E3 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 1D0966B0087; Thu, 17 Sep 2020 13:19:31 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 180298E0001; Thu, 17 Sep 2020 13:19:31 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 097596B008A; Thu, 17 Sep 2020 13:19:31 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0214.hostedemail.com [216.40.44.214]) by kanga.kvack.org (Postfix) with ESMTP id E416F6B0087 for ; Thu, 17 Sep 2020 13:19:30 -0400 (EDT) Received: from smtpin07.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id A0FC43658 for ; Thu, 17 Sep 2020 17:19:30 +0000 (UTC) X-FDA: 77273214900.07.metal09_140010627124 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin07.hostedemail.com (Postfix) with ESMTP id 822461803F9BC for ; Thu, 17 Sep 2020 17:19:30 +0000 (UTC) X-HE-Tag: metal09_140010627124 X-Filterd-Recvd-Size: 4148 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf25.hostedemail.com (Postfix) with ESMTP for ; Thu, 17 Sep 2020 17:19:30 +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=zqogdmLdzta9J0hBp0MDw02DVO1+TlY53BsA/rdY28w=; b=jeRYq0Vwt9pDvQPIMoyHro1yPb FHLgKT0EE0F3CGpywm1KG8OwiJJFjhdu5Hy+Fq27PpVMJpvD3imnqU4JlIGRl2wxMZ+GiAkM8BD3i m+it0FNFbx9rvkDFC3aN9wRniryRAj4Nk1oSJPmvjdUiXGihk//L8boGcBSdZr3h+Ge3whWtgPDzR OC5GosDEqYL4yKWdpJA9garZ+5LIlbalsvqNx95LLOLyj0vSm42XsyuE82HIf0UUbJjGLAnK/Gj1S jQRVwfbkcYpp2v9saNOtAMjtoYDiw6dJMW8wmaJ039NFk/htZdonS7FB1Qaalgr6m4aqI0q/+mtof a2k0498A==; Received: from 089144214092.atnat0023.highway.a1.net ([89.144.214.92] helo=localhost) by casper.infradead.org with esmtpsa (Exim 4.92.3 #3 (Red Hat Linux)) id 1kIxYu-0001lr-Fs; Thu, 17 Sep 2020 17:19:12 +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 09/14] ocfs2: cleanup o2hb_region_dev_store Date: Thu, 17 Sep 2020 18:57:15 +0200 Message-Id: <20200917165720.3285256-10-hch@lst.de> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200917165720.3285256-1-hch@lst.de> References: <20200917165720.3285256-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 igrab (aka open coded bdgrab) + blkdev_get. Signed-off-by: Christoph Hellwig --- fs/ocfs2/cluster/heartbeat.c | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/fs/ocfs2/cluster/heartbeat.c b/fs/ocfs2/cluster/heartbeat.c index 89d13e0705fe7b..0179a73a3fa2c4 100644 --- a/fs/ocfs2/cluster/heartbeat.c +++ b/fs/ocfs2/cluster/heartbeat.c @@ -1766,7 +1766,6 @@ static ssize_t o2hb_region_dev_store(struct config_= item *item, int sectsize; char *p =3D (char *)page; struct fd f; - struct inode *inode; ssize_t ret =3D -EINVAL; int live_threshold; =20 @@ -1793,20 +1792,16 @@ static ssize_t o2hb_region_dev_store(struct confi= g_item *item, reg->hr_block_bytes =3D=3D 0) goto out2; =20 - inode =3D igrab(f.file->f_mapping->host); - if (inode =3D=3D NULL) + if (!S_ISBLK(f.file->f_mapping->host->i_mode)) goto out2; =20 - if (!S_ISBLK(inode->i_mode)) - goto out3; - - reg->hr_bdev =3D I_BDEV(f.file->f_mapping->host); - ret =3D blkdev_get(reg->hr_bdev, FMODE_WRITE | FMODE_READ, NULL); - if (ret) { + reg->hr_bdev =3D blkdev_get_by_dev(f.file->f_mapping->host->i_rdev, + FMODE_WRITE | FMODE_READ, NULL); + if (IS_ERR(reg->hr_bdev)) { + ret =3D PTR_ERR(reg->hr_bdev); reg->hr_bdev =3D NULL; - goto out3; + goto out2; } - inode =3D NULL; =20 bdevname(reg->hr_bdev, reg->hr_dev_name); =20 @@ -1909,16 +1904,13 @@ static ssize_t o2hb_region_dev_store(struct confi= g_item *item, config_item_name(®->hr_item), reg->hr_dev_name); =20 out3: - iput(inode); + if (ret < 0) { + blkdev_put(reg->hr_bdev, FMODE_READ | FMODE_WRITE); + reg->hr_bdev =3D NULL; + } out2: fdput(f); out: - if (ret < 0) { - if (reg->hr_bdev) { - blkdev_put(reg->hr_bdev, FMODE_READ|FMODE_WRITE); - reg->hr_bdev =3D NULL; - } - } return ret; } =20 --=20 2.28.0