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 8E695C43463 for ; Mon, 21 Sep 2020 07:20:28 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 14051207DE for ; Mon, 21 Sep 2020 07:20:28 +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="Fg+jVrRt" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 14051207DE 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 EB5F290002C; Mon, 21 Sep 2020 03:20:16 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E1715900029; Mon, 21 Sep 2020 03:20:16 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CDD0E90002D; Mon, 21 Sep 2020 03:20:16 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0226.hostedemail.com [216.40.44.226]) by kanga.kvack.org (Postfix) with ESMTP id ABF8390002C for ; Mon, 21 Sep 2020 03:20:16 -0400 (EDT) Received: from smtpin18.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 69B60180AD804 for ; Mon, 21 Sep 2020 07:20:16 +0000 (UTC) X-FDA: 77286220032.18.hose78_5c15f5e27143 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin18.hostedemail.com (Postfix) with ESMTP id 4A228100EC674 for ; Mon, 21 Sep 2020 07:20:16 +0000 (UTC) X-HE-Tag: hose78_5c15f5e27143 X-Filterd-Recvd-Size: 5825 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf18.hostedemail.com (Postfix) with ESMTP for ; Mon, 21 Sep 2020 07:20:15 +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=OOOyqbfGBfADtTd2OFjO0d+j7/uUOQY5tAGUzrpX3bI=; b=Fg+jVrRtZJpJ9kcTFRFiN5ur4w iNJb151F26Kg+6mk83/7FBN8HtwBsGu2VW2x2tPwIHqUbnWCynZVWMVEZRXUenkS2HO0I+io/+M9q yL+kBkDog+m/NbE8VIBZEdb1RLomNqZ0sf2ffr926uhdZysv+43dZQakXwVtLd5dpw9u288aY/26n OWcPmOPtiKB0fkN4Zn2kyiS0u3UDsuciOilbRoXujf99uG4brqxixaoeLyc03rZIKJY+BWJzqA3ww l3CP0o/N5Y02VaCZ1q7lmf7Khe3ZLNoluwHOKwyOmmkARD1A7i8lz5bhnuJlJb4YiFTxyH6iDKPSt yE89IMiQ==; 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 1kKG7B-0003F5-Dd; Mon, 21 Sep 2020 07:19:57 +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 07/14] raw: don't keep unopened block device around Date: Mon, 21 Sep 2020 09:19:51 +0200 Message-Id: <20200921071958.307589-8-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: Turn binding into a normal dev_t as the struct block device doesn't buy us anything and use blkdev_open_by_dev to actually open it. Signed-off-by: Christoph Hellwig --- drivers/char/raw.c | 51 +++++++++++++++++----------------------------- 1 file changed, 19 insertions(+), 32 deletions(-) diff --git a/drivers/char/raw.c b/drivers/char/raw.c index ccf5bd528642da..5d52a1f4738c76 100644 --- a/drivers/char/raw.c +++ b/drivers/char/raw.c @@ -28,7 +28,8 @@ #include =20 struct raw_device_data { - struct block_device *binding; + dev_t binding; + struct block_device *bdev; int inuse; }; =20 @@ -73,14 +74,15 @@ static int raw_open(struct inode *inode, struct file = *filp) /* * All we need to do on open is check that the device is bound. */ - bdev =3D raw_devices[minor].binding; err =3D -ENODEV; - if (!bdev) + if (!raw_devices[minor].binding) goto out; - bdgrab(bdev); - err =3D blkdev_get(bdev, filp->f_mode | FMODE_EXCL, raw_open); - if (err) + bdev =3D blkdev_get_by_dev(raw_devices[minor].binding, + filp->f_mode | FMODE_EXCL, raw_open); + if (IS_ERR(bdev)) { + err =3D PTR_ERR(bdev); goto out; + } err =3D set_blocksize(bdev, bdev_logical_block_size(bdev)); if (err) goto out1; @@ -90,6 +92,7 @@ static int raw_open(struct inode *inode, struct file *f= ilp) file_inode(filp)->i_mapping =3D bdev->bd_inode->i_mapping; filp->private_data =3D bdev; + raw_devices[minor].bdev =3D bdev; mutex_unlock(&raw_mutex); return 0; =20 @@ -110,7 +113,7 @@ static int raw_release(struct inode *inode, struct fi= le *filp) struct block_device *bdev; =20 mutex_lock(&raw_mutex); - bdev =3D raw_devices[minor].binding; + bdev =3D raw_devices[minor].bdev; if (--raw_devices[minor].inuse =3D=3D 0) /* Here inode->i_mapping =3D=3D bdev->bd_inode->i_mapping */ inode->i_mapping =3D &inode->i_data; @@ -133,6 +136,7 @@ raw_ioctl(struct file *filp, unsigned int command, un= signed long arg) static int bind_set(int number, u64 major, u64 minor) { dev_t dev =3D MKDEV(major, minor); + dev_t raw =3D MKDEV(RAW_MAJOR, number); struct raw_device_data *rawdev; int err =3D 0; =20 @@ -166,25 +170,17 @@ static int bind_set(int number, u64 major, u64 mino= r) mutex_unlock(&raw_mutex); return -EBUSY; } - if (rawdev->binding) { - bdput(rawdev->binding); + if (rawdev->binding) module_put(THIS_MODULE); - } + + rawdev->binding =3D dev; if (!dev) { /* unbind */ - rawdev->binding =3D NULL; - device_destroy(raw_class, MKDEV(RAW_MAJOR, number)); + device_destroy(raw_class, raw); } else { - rawdev->binding =3D bdget(dev); - if (rawdev->binding =3D=3D NULL) { - err =3D -ENOMEM; - } else { - dev_t raw =3D MKDEV(RAW_MAJOR, number); - __module_get(THIS_MODULE); - device_destroy(raw_class, raw); - device_create(raw_class, NULL, raw, NULL, - "raw%d", number); - } + __module_get(THIS_MODULE); + device_destroy(raw_class, raw); + device_create(raw_class, NULL, raw, NULL, "raw%d", number); } mutex_unlock(&raw_mutex); return err; @@ -192,18 +188,9 @@ static int bind_set(int number, u64 major, u64 minor= ) =20 static int bind_get(int number, dev_t *dev) { - struct raw_device_data *rawdev; - struct block_device *bdev; - if (number <=3D 0 || number >=3D max_raw_minors) return -EINVAL; - - rawdev =3D &raw_devices[number]; - - mutex_lock(&raw_mutex); - bdev =3D rawdev->binding; - *dev =3D bdev ? bdev->bd_dev : 0; - mutex_unlock(&raw_mutex); + *dev =3D raw_devices[number].binding; return 0; } =20 --=20 2.28.0