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 93317C64E7B for ; Thu, 26 Nov 2020 13:33:41 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 2C3E921D40 for ; Thu, 26 Nov 2020 13:33:41 +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="FvaOkU4k" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2C3E921D40 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 3AAB36B0070; Thu, 26 Nov 2020 08:33:40 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 336566B0071; Thu, 26 Nov 2020 08:33:40 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 18A116B0072; Thu, 26 Nov 2020 08:33:40 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0180.hostedemail.com [216.40.44.180]) by kanga.kvack.org (Postfix) with ESMTP id EA2706B0070 for ; Thu, 26 Nov 2020 08:33:39 -0500 (EST) Received: from smtpin16.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id B439D181AEF32 for ; Thu, 26 Nov 2020 13:33:39 +0000 (UTC) X-FDA: 77526661758.16.brush27_21124fb2737f Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin16.hostedemail.com (Postfix) with ESMTP id 8D2D2100E6903 for ; Thu, 26 Nov 2020 13:33:39 +0000 (UTC) X-HE-Tag: brush27_21124fb2737f X-Filterd-Recvd-Size: 3165 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf36.hostedemail.com (Postfix) with ESMTP for ; Thu, 26 Nov 2020 13:33:39 +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=nM9OOc09jMaYn13UV1xnGqzKik4TLLc3/ktZdtaCR0w=; b=FvaOkU4kHXBfdVMOB12oBu42Hv 2Q6c93H7622fyezJLxcX1lNn6/+eBm1N4BO6MUqga76cjNXsxq+yP9INBhup2opIJdInRULSN9aDv GXbI+5/8/S8q0EEQqeJMGpAxYRc9Bouh85ULoV7h2+YJtrqWK591lWcqICJoIMhn+6U32lVibdG6c zdzfdXIPDC9Gr8O03nTWJEA0xUmb3isXObNWRHLOLN9RLVwU4MUy3AIKq3kZuzMn+AmgsOgUThrS/ AH8fDByu5LV7WH3TMt6wI71LLeECxnAiCKy4fsXHiDZZN9KarAZRFuaXs+F2IoEGCuauV4qgnSctF 1Pk0KJbA==; Received: from [2001:4bb8:18c:1dd6:27b8:b8a1:c13e:ceb1] (helo=localhost) by casper.infradead.org with esmtpsa (Exim 4.92.3 #3 (Red Hat Linux)) id 1kiGzI-00042P-5Y; Thu, 26 Nov 2020 13:07:04 +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 22/44] block: opencode devcgroup_inode_permission Date: Thu, 26 Nov 2020 14:04:00 +0100 Message-Id: <20201126130422.92945-23-hch@lst.de> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201126130422.92945-1-hch@lst.de> References: <20201126130422.92945-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 --- 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 d0783c55a0ce65..b12ab68297baf3 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c @@ -1516,15 +1516,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