From patchwork Tue Jul 13 11:13:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Brauner X-Patchwork-Id: 12373673 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=-19.7 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=unavailable 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 817B3C07E95 for ; Tue, 13 Jul 2021 11:16:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6B3B46127C for ; Tue, 13 Jul 2021 11:16:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235965AbhGMLTa (ORCPT ); Tue, 13 Jul 2021 07:19:30 -0400 Received: from mail.kernel.org ([198.145.29.99]:47298 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235722AbhGMLT3 (ORCPT ); Tue, 13 Jul 2021 07:19:29 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 2E95461164; Tue, 13 Jul 2021 11:16:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1626174999; bh=Ypx8lR5RjOf76of34VRfY1iBSYOZtZAOJSsDLHWgBTo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eX6U5Qb0PphrvtG1cLRfUbprM3JggVAI93mo39RtxtVng7P5F5cGhqbJ9n/gbfG0O 6Q8xS3Y5yTcgEbBbNjsHuQ8pNA1ysdhEmolwlTdokkcKeUajG5hnWfZLZS4hbLMc99 2eXOjdFocNKbJroZjM10nL8gzcITMna6S3ZzvrK1dge2E0WvD//5oj2qSDkvpCIJHt W0YhqxaBU0kIadKUQgPARsmipKDmrgByZvs999/D7nu4OxgRo0+Kb4mamWPL7wKSiA OqOUTzKxTN0+/n5W9zEYeb9wNPMmEpgZHt7LV2QrXqd/QVYyfFkkNFLVpxw+5VKDTP NU1+Mx3cBF1Lw== From: Christian Brauner To: Christoph Hellwig , Chris Mason , Josef Bacik , David Sterba , Al Viro Cc: linux-btrfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, Christian Brauner , Christoph Hellwig Subject: [PATCH 14/24] btrfs/inode: allow idmapped permission iop Date: Tue, 13 Jul 2021 13:13:34 +0200 Message-Id: <20210713111344.1149376-15-brauner@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210713111344.1149376-1-brauner@kernel.org> References: <20210713111344.1149376-1-brauner@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=965; h=from:subject; bh=HOMgk9xSp2+unZe8XN3SFO5+XS+rZFI85aLkGhjJ16E=; b=owGbwMvMwCU28Zj0gdSKO4sYT6slMSS8LY1+O2/1Rom3ot6pzxXnWwStem+tUVZy55JwgozKfr8z 1/7pdpSyMIhxMciKKbI4tJuEyy3nqdhslKkBM4eVCWQIAxenAEzkyxJGhvmfJ6ixLDz9+v35Pxr7nn ffn9De4TPnkOVptpnqLGd2JrEw/C9Manmffbfx0N9ZuRmsObLchQplS785m/Vu37BrUue0JG4A X-Developer-Key: i=christian.brauner@ubuntu.com; a=openpgp; fpr=4880B8C9BD0E5106FC070F4F7B3C391EFEA93624 Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@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 --- 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 8a80ef810703..3b537d90172e 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -10185,7 +10185,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,