From patchwork Thu Sep 22 15:17:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Brauner X-Patchwork-Id: 12985410 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A3140C6FA86 for ; Thu, 22 Sep 2022 15:19:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232019AbiIVPTR (ORCPT ); Thu, 22 Sep 2022 11:19:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41180 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231984AbiIVPSn (ORCPT ); Thu, 22 Sep 2022 11:18:43 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A381AEF08F; Thu, 22 Sep 2022 08:18:42 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 41DD6635D8; Thu, 22 Sep 2022 15:18:42 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 12D81C433B5; Thu, 22 Sep 2022 15:18:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1663859921; bh=vjtzaI6fQogsoDW17FlX5AgCfjQQ175EgJ3HMzyUBXw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XXokH8ZH+JxH+G1+lckiQpjJ08UAqlUbAA9olUw/bjcXIj3womNBXprh/mpPd8rE7 atU6rZ990EwPicAo3tn/yLhQ1v/8soRtNxRDpLjSlHxdAqEL61OM0pc2H71eJ5dxNt du2BDw1dBKYuqK3CrYSfsT5BZ6t3y5JpXZ5hhdyMwCBipgPMn1SgHr6uargvgomaq7 +WA1s61Fir/YytFIM0FxNX/TYOpsdVRoaMQGq9BkhgOIJvuUvhJfhgaaEs5oCKvm4o MOaNmb9QoIRpKwErnh2+PS2XG8ukZJ4JILISRX2dGUXN+8UZlxynRA51becQyJoNVT waVEeqsGmdRDw== From: Christian Brauner To: linux-fsdevel@vger.kernel.org Cc: Christian Brauner , Seth Forshee , Christoph Hellwig , Al Viro , Tyler Hicks , ecryptfs@vger.kernel.org Subject: [PATCH 25/29] ecryptfs: use stub posix acl handlers Date: Thu, 22 Sep 2022 17:17:23 +0200 Message-Id: <20220922151728.1557914-26-brauner@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220922151728.1557914-1-brauner@kernel.org> References: <20220922151728.1557914-1-brauner@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=786; i=brauner@kernel.org; h=from:subject; bh=vjtzaI6fQogsoDW17FlX5AgCfjQQ175EgJ3HMzyUBXw=; b=owGbwMvMwCU28Zj0gdSKO4sYT6slMSTr1NS8XdzOfZ1Bcc+sWXtblryuCgprE2WIDH9zRvjPKs/g H9U1HaUsDGJcDLJiiiwO7Sbhcst5KjYbZWrAzGFlAhnCwMUpABOJ2cLIcPt8leRRJ67Fi3UVnjPMOd S52lmU2/DnU43akuvx0yP/rmRk6Ejeop9sNztL0sKi30HaTnv9u92/KgPKxIKz9lnuvGvHCAA= X-Developer-Key: i=brauner@kernel.org; a=openpgp; fpr=4880B8C9BD0E5106FC070F4F7B3C391EFEA93624 Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org Now that ecryptfs supports the get and set acl inode operations and the vfs has been switched to the new posi api, ecryptfs can simply rely on the stub posix acl handlers. Signed-off-by: Christian Brauner (Microsoft) --- fs/ecryptfs/inode.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c index c3d1ae688a19..bd6ae2582cd6 100644 --- a/fs/ecryptfs/inode.c +++ b/fs/ecryptfs/inode.c @@ -1210,6 +1210,10 @@ static const struct xattr_handler ecryptfs_xattr_handler = { }; const struct xattr_handler *ecryptfs_xattr_handlers[] = { +#ifdef CONFIG_XFS_POSIX_ACL + &posix_acl_access_xattr_handler, + &posix_acl_default_xattr_handler, +#endif &ecryptfs_xattr_handler, NULL };