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=-16.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 89493C63697 for ; Sat, 28 Nov 2020 16:16:24 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 35C652224D for ; Sat, 28 Nov 2020 16:16:24 +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="l9I7x+zf" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 35C652224D 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 392A18D001E; Sat, 28 Nov 2020 11:16:05 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 190CA8D0017; Sat, 28 Nov 2020 11:16:05 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F20E88D001E; Sat, 28 Nov 2020 11:16:04 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0105.hostedemail.com [216.40.44.105]) by kanga.kvack.org (Postfix) with ESMTP id C50388D0017 for ; Sat, 28 Nov 2020 11:16:04 -0500 (EST) Received: from smtpin24.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 8F3F73637 for ; Sat, 28 Nov 2020 16:16:04 +0000 (UTC) X-FDA: 77534328648.24.star22_310344327392 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin24.hostedemail.com (Postfix) with ESMTP id 73F1C1A4A0 for ; Sat, 28 Nov 2020 16:16:04 +0000 (UTC) X-HE-Tag: star22_310344327392 X-Filterd-Recvd-Size: 3206 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf17.hostedemail.com (Postfix) with ESMTP for ; Sat, 28 Nov 2020 16:16:03 +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=FsZkmK6a2hs6E6Z9B6tfmRfHQ191hKagU9+KV6WFNtM=; b=l9I7x+zfyYy3M2QfALdSBmMsHC /hZdHYin491tNVgPie7TBuJZzFyo091g3Z3RoFGD6dlAE+OUKJOtb7eRUIU4RB/bNzQl4e4qsssKH Ao1PN+wyfDizhgsZX2jn2PgmKF9CeOZGNuJziuLNr2ZLA/VbsOzHk4Cduo3Xe0xf/bEgEzGdZDClJ Ww+iO61t7F+pb2DRHDUPgaNeC9ZnPNxxmBB0rcLkfM8WGXapvAc4DpS34CnYnE+qOSSsQ3wMCWVaq gjRsfGbqT1SOQKUSbjLatxILGDXHnAsZgc+oh4AoexldboXuOdV5X8KWrVeCTXA5s77Y1BrobRQf6 FDKVcGXA==; Received: from [2001:4bb8:18c:1dd6:48f3:741a:602e:7fdd] (helo=localhost) by casper.infradead.org with esmtpsa (Exim 4.92.3 #3 (Red Hat Linux)) id 1kj2t4-0000Jl-6t; Sat, 28 Nov 2020 16:15:50 +0000 From: Christoph Hellwig To: Jens Axboe Cc: Tejun Heo , Josef Bacik , Coly Li , Mike Snitzer , Greg Kroah-Hartman , Jan Kara , Johannes Thumshirn , dm-devel@redhat.com, Jan Kara , linux-block@vger.kernel.org, linux-bcache@vger.kernel.org, linux-mtd@lists.infradead.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 23/45] block: opencode devcgroup_inode_permission Date: Sat, 28 Nov 2020 17:14:48 +0100 Message-Id: <20201128161510.347752-24-hch@lst.de> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201128161510.347752-1-hch@lst.de> References: <20201128161510.347752-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: Just call devcgroup_check_permission to avoid various superflous checks and a double conversion of the access flags. Signed-off-by: Christoph Hellwig Acked-by: Tejun Heo Reviewed-by: Jan Kara --- fs/block_dev.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/fs/block_dev.c b/fs/block_dev.c index a2d5050c97ee08..2b8c0586314fe2 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c @@ -1520,15 +1520,13 @@ static int blkdev_get(struct block_device *bdev, = fmode_t mode, void *holder) struct block_device *claiming; bool unblock_events =3D true; struct gendisk *disk; - int perm =3D 0; int partno; int ret; =20 - if (mode & FMODE_READ) - perm |=3D MAY_READ; - if (mode & FMODE_WRITE) - perm |=3D MAY_WRITE; - ret =3D devcgroup_inode_permission(bdev->bd_inode, perm); + ret =3D devcgroup_check_permission(DEVCG_DEV_BLOCK, + imajor(bdev->bd_inode), iminor(bdev->bd_inode), + ((mode & FMODE_READ) ? DEVCG_ACC_READ : 0) | + ((mode & FMODE_WRITE) ? DEVCG_ACC_WRITE : 0)); if (ret) goto bdput; =20 --=20 2.29.2