From patchwork Mon Jul 19 11:10:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Brauner X-Patchwork-Id: 12385557 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=-20.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,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 41CA6C636C9 for ; Mon, 19 Jul 2021 11:11:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2B7D8600EF for ; Mon, 19 Jul 2021 11:11:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236641AbhGSKau (ORCPT ); Mon, 19 Jul 2021 06:30:50 -0400 Received: from mail.kernel.org ([198.145.29.99]:59538 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236619AbhGSKar (ORCPT ); Mon, 19 Jul 2021 06:30:47 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 86FE961181; Mon, 19 Jul 2021 11:11:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1626693087; bh=nMTMNxyJcEo9K1ozLBMPSdFnOdaMIeQIOWxmveqYTrE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Quww9GjPZYJwfxx/DXote/Ek//DMiq49PWm/Jx6OKRkIFcrbidZIKDtEVCmZUMMYm oLCNMxHfXLZ8YI5baAhWoMFb8wF31ceIuO+1U8BF4KoVRF6FVUCQhG/dBR8YMHX9Or 66pUofXCwKLXXsR2w9cHfcrW32sJLHiyupGREDuQGteK/3JJgToZLSKTwkRiev0GSQ zIExotK4wOJ66h2vulXH5372Avzh8Yv3slCp2qO40Xlqq+Qu9kw/Kz+dy5c7FtZMhx rFQ2TiXIeWywPCC1DLvKHITRmrBNXijSkxM+gZh64xH+kimIZjWpTaM1z13YxzWwad H3FeT5lyGwLxg== From: Christian Brauner To: Christoph Hellwig , Chris Mason , Josef Bacik , David Sterba , Al Viro Cc: linux-btrfs@vger.kernel.org, Christian Brauner , Christoph Hellwig Subject: [PATCH v2 11/21] btrfs/inode: allow idmapped permission iop Date: Mon, 19 Jul 2021 13:10:42 +0200 Message-Id: <20210719111052.1626299-12-brauner@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210719111052.1626299-1-brauner@kernel.org> References: <20210719111052.1626299-1-brauner@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=991; h=from:subject; bh=UB3qI906TzplOANkGHMYQ0hDC06vJuELU9QDNAzTHgU=; b=owGbwMvMwCU28Zj0gdSKO4sYT6slMSR8jd129eGVWL4nt7QXNd0P+BNZI3YgyI3/6Mx167n8+38z Ly4t7ChlYRDjYpAVU2RxaDcJl1vOU7HZKFMDZg4rE8gQBi5OAZiIswLD/5y+q3oNFzMPWfyo+7L3TK Uje/vL+40O21c9Fzhg03mpei/DXxmN+JuVrKtvXX7rviyf4WXX0TyTfcmLXpb/k3xW6Wq1mRcA X-Developer-Key: i=christian.brauner@ubuntu.com; a=openpgp; fpr=4880B8C9BD0E5106FC070F4F7B3C391EFEA93624 Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org From: Christian Brauner Enable btrfs_permission() to handle idmapped mounts. This is just a matter of passing down the mount's userns. Cc: Chris Mason Cc: Josef Bacik Cc: Christoph Hellwig Cc: David Sterba Cc: linux-btrfs@vger.kernel.org Signed-off-by: Christian Brauner --- /* v2 */ unchanged --- fs/btrfs/inode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 53b038029440..a2a36a45998e 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -10274,7 +10274,7 @@ static int btrfs_permission(struct user_namespace *mnt_userns, if (BTRFS_I(inode)->flags & BTRFS_INODE_READONLY) return -EACCES; } - return generic_permission(&init_user_ns, inode, mask); + return generic_permission(mnt_userns, inode, mask); } static int btrfs_tmpfile(struct user_namespace *mnt_userns, struct inode *dir,