From: Christian Brauner <brauner@kernel.org> To: linux-fsdevel@vger.kernel.org, Christoph Hellwig <hch@lst.de> Cc: Al Viro <viro@zeniv.linux.org.uk>, Seth Forshee <sforshee@kernel.org>, "Christian Brauner (Microsoft)" <brauner@kernel.org>, ocfs2-devel@oss.oracle.com Subject: [PATCH 10/12] ocfs2: drop posix acl handlers Date: Wed, 25 Jan 2023 12:28:55 +0100 [thread overview] Message-ID: <20230125-fs-acl-remove-generic-xattr-handlers-v1-10-6cf155b492b6@kernel.org> (raw) In-Reply-To: <20230125-fs-acl-remove-generic-xattr-handlers-v1-0-6cf155b492b6@kernel.org> Last cycle we introduced a new posix acl api. Filesystems now only need to implement the inode operations for posix acls. The generic xattr handlers aren't used anymore by the vfs and will be completely removed. Keeping the handler around is confusing and gives the false impression that the xattr infrastructure of the vfs is used to interact with posix acls when it really isn't anymore. For this to work we simply rework the ->listxattr() inode operation to not rely on the generix posix acl handlers anymore. Cc: <ocfs2-devel@oss.oracle.com> Signed-off-by: Christian Brauner (Microsoft) <brauner@kernel.org> --- fs/ocfs2/xattr.c | 41 +++++++++++++++++++++++++---------------- 1 file changed, 25 insertions(+), 16 deletions(-) diff --git a/fs/ocfs2/xattr.c b/fs/ocfs2/xattr.c index 95d0611c5fc7..e55cd11d72fc 100644 --- a/fs/ocfs2/xattr.c +++ b/fs/ocfs2/xattr.c @@ -89,23 +89,11 @@ static struct ocfs2_xattr_def_value_root def_xv = { const struct xattr_handler *ocfs2_xattr_handlers[] = { &ocfs2_xattr_user_handler, - &posix_acl_access_xattr_handler, - &posix_acl_default_xattr_handler, &ocfs2_xattr_trusted_handler, &ocfs2_xattr_security_handler, NULL }; -static const struct xattr_handler *ocfs2_xattr_handler_map[OCFS2_XATTR_MAX] = { - [OCFS2_XATTR_INDEX_USER] = &ocfs2_xattr_user_handler, - [OCFS2_XATTR_INDEX_POSIX_ACL_ACCESS] - = &posix_acl_access_xattr_handler, - [OCFS2_XATTR_INDEX_POSIX_ACL_DEFAULT] - = &posix_acl_default_xattr_handler, - [OCFS2_XATTR_INDEX_TRUSTED] = &ocfs2_xattr_trusted_handler, - [OCFS2_XATTR_INDEX_SECURITY] = &ocfs2_xattr_security_handler, -}; - struct ocfs2_xattr_info { int xi_name_index; const char *xi_name; @@ -528,13 +516,34 @@ static int ocfs2_read_xattr_block(struct inode *inode, u64 xb_blkno, return rc; } -static inline const char *ocfs2_xattr_prefix(int name_index) +static const char *ocfs2_xattr_prefix(int xattr_index) { + const char *name = NULL; const struct xattr_handler *handler = NULL; - if (name_index > 0 && name_index < OCFS2_XATTR_MAX) - handler = ocfs2_xattr_handler_map[name_index]; - return handler ? xattr_prefix(handler) : NULL; + switch (xattr_index) { + case OCFS2_XATTR_INDEX_USER: + handler = &ocfs2_xattr_user_handler; + break; + case OCFS2_XATTR_INDEX_TRUSTED: + handler = &ocfs2_xattr_trusted_handler; + break; + case OCFS2_XATTR_INDEX_SECURITY: + handler = &ocfs2_xattr_security_handler; + break; + case OCFS2_XATTR_INDEX_POSIX_ACL_ACCESS: + name = XATTR_NAME_POSIX_ACL_ACCESS; + break; + case OCFS2_XATTR_INDEX_POSIX_ACL_DEFAULT: + name = XATTR_NAME_POSIX_ACL_DEFAULT; + break; + default: + return NULL; + } + + name = xattr_prefix(handler); + + return name; } static u32 ocfs2_xattr_name_hash(struct inode *inode, -- 2.34.1
WARNING: multiple messages have this Message-ID (diff)
From: Christian Brauner via Ocfs2-devel <ocfs2-devel@oss.oracle.com> To: linux-fsdevel@vger.kernel.org, Christoph Hellwig <hch@lst.de> Cc: "Christian Brauner \(Microsoft\)" <brauner@kernel.org>, Al Viro <viro@zeniv.linux.org.uk>, ocfs2-devel@oss.oracle.com, Seth Forshee <sforshee@kernel.org> Subject: [Ocfs2-devel] [PATCH 10/12] ocfs2: drop posix acl handlers Date: Wed, 25 Jan 2023 12:28:55 +0100 [thread overview] Message-ID: <20230125-fs-acl-remove-generic-xattr-handlers-v1-10-6cf155b492b6@kernel.org> (raw) In-Reply-To: <20230125-fs-acl-remove-generic-xattr-handlers-v1-0-6cf155b492b6@kernel.org> Last cycle we introduced a new posix acl api. Filesystems now only need to implement the inode operations for posix acls. The generic xattr handlers aren't used anymore by the vfs and will be completely removed. Keeping the handler around is confusing and gives the false impression that the xattr infrastructure of the vfs is used to interact with posix acls when it really isn't anymore. For this to work we simply rework the ->listxattr() inode operation to not rely on the generix posix acl handlers anymore. Cc: <ocfs2-devel@oss.oracle.com> Signed-off-by: Christian Brauner (Microsoft) <brauner@kernel.org> --- fs/ocfs2/xattr.c | 41 +++++++++++++++++++++++++---------------- 1 file changed, 25 insertions(+), 16 deletions(-) diff --git a/fs/ocfs2/xattr.c b/fs/ocfs2/xattr.c index 95d0611c5fc7..e55cd11d72fc 100644 --- a/fs/ocfs2/xattr.c +++ b/fs/ocfs2/xattr.c @@ -89,23 +89,11 @@ static struct ocfs2_xattr_def_value_root def_xv = { const struct xattr_handler *ocfs2_xattr_handlers[] = { &ocfs2_xattr_user_handler, - &posix_acl_access_xattr_handler, - &posix_acl_default_xattr_handler, &ocfs2_xattr_trusted_handler, &ocfs2_xattr_security_handler, NULL }; -static const struct xattr_handler *ocfs2_xattr_handler_map[OCFS2_XATTR_MAX] = { - [OCFS2_XATTR_INDEX_USER] = &ocfs2_xattr_user_handler, - [OCFS2_XATTR_INDEX_POSIX_ACL_ACCESS] - = &posix_acl_access_xattr_handler, - [OCFS2_XATTR_INDEX_POSIX_ACL_DEFAULT] - = &posix_acl_default_xattr_handler, - [OCFS2_XATTR_INDEX_TRUSTED] = &ocfs2_xattr_trusted_handler, - [OCFS2_XATTR_INDEX_SECURITY] = &ocfs2_xattr_security_handler, -}; - struct ocfs2_xattr_info { int xi_name_index; const char *xi_name; @@ -528,13 +516,34 @@ static int ocfs2_read_xattr_block(struct inode *inode, u64 xb_blkno, return rc; } -static inline const char *ocfs2_xattr_prefix(int name_index) +static const char *ocfs2_xattr_prefix(int xattr_index) { + const char *name = NULL; const struct xattr_handler *handler = NULL; - if (name_index > 0 && name_index < OCFS2_XATTR_MAX) - handler = ocfs2_xattr_handler_map[name_index]; - return handler ? xattr_prefix(handler) : NULL; + switch (xattr_index) { + case OCFS2_XATTR_INDEX_USER: + handler = &ocfs2_xattr_user_handler; + break; + case OCFS2_XATTR_INDEX_TRUSTED: + handler = &ocfs2_xattr_trusted_handler; + break; + case OCFS2_XATTR_INDEX_SECURITY: + handler = &ocfs2_xattr_security_handler; + break; + case OCFS2_XATTR_INDEX_POSIX_ACL_ACCESS: + name = XATTR_NAME_POSIX_ACL_ACCESS; + break; + case OCFS2_XATTR_INDEX_POSIX_ACL_DEFAULT: + name = XATTR_NAME_POSIX_ACL_DEFAULT; + break; + default: + return NULL; + } + + name = xattr_prefix(handler); + + return name; } static u32 ocfs2_xattr_name_hash(struct inode *inode, -- 2.34.1 _______________________________________________ Ocfs2-devel mailing list Ocfs2-devel@oss.oracle.com https://oss.oracle.com/mailman/listinfo/ocfs2-devel
next prev parent reply other threads:[~2023-01-25 11:30 UTC|newest] Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-01-25 11:28 [f2fs-dev] [PATCH 00/12] acl: remove remaining posix acl handlers Christian Brauner 2023-01-25 11:28 ` Christian Brauner 2023-01-25 11:28 ` [Ocfs2-devel] " Christian Brauner via Ocfs2-devel 2023-01-25 11:28 ` Christian Brauner 2023-01-25 11:28 ` Christian Brauner 2023-01-25 11:28 ` Christian Brauner 2023-01-25 11:28 ` [PATCH 01/12] xattr: simplify listxattr helpers Christian Brauner 2023-01-30 6:35 ` Christoph Hellwig 2023-01-25 11:28 ` [PATCH 02/12] xattr, posix acl: add " Christian Brauner 2023-01-30 6:37 ` Christoph Hellwig 2023-01-25 11:28 ` [PATCH 03/12] xattr: remove unused argument Christian Brauner 2023-01-30 6:37 ` Christoph Hellwig 2023-01-25 11:28 ` [PATCH 04/12] fs: drop unused posix acl handlers Christian Brauner 2023-01-30 6:38 ` Christoph Hellwig 2023-01-25 11:28 ` [PATCH 05/12] erofs: drop " Christian Brauner 2023-01-25 11:28 ` Christian Brauner 2023-01-30 6:43 ` Christoph Hellwig 2023-01-30 6:43 ` Christoph Hellwig 2023-01-30 9:00 ` Christian Brauner 2023-01-30 9:00 ` Christian Brauner 2023-01-30 9:11 ` Christoph Hellwig 2023-01-30 9:11 ` Christoph Hellwig 2023-01-25 11:28 ` [PATCH 06/12] ext2: " Christian Brauner 2023-01-25 13:03 ` Jan Kara 2023-01-25 11:28 ` [PATCH 07/12] ext4: " Christian Brauner 2023-01-25 11:28 ` [f2fs-dev] [PATCH 08/12] f2fs: " Christian Brauner 2023-01-25 11:28 ` Christian Brauner 2023-01-25 11:28 ` [PATCH 09/12] jffs2: " Christian Brauner 2023-01-25 11:28 ` Christian Brauner 2023-01-25 11:28 ` Christian Brauner [this message] 2023-01-25 11:28 ` [Ocfs2-devel] [PATCH 10/12] ocfs2: " Christian Brauner via Ocfs2-devel 2023-01-25 11:28 ` [PATCH 11/12] reiserfs: " Christian Brauner 2023-01-25 11:28 ` [PATCH 12/12] acl: remove " Christian Brauner 2023-01-31 12:04 ` kernel test robot 2023-01-30 9:10 ` [PATCH 00/12] acl: remove remaining " Christian Brauner 2023-01-30 9:10 ` Christian Brauner 2023-01-30 9:10 ` [f2fs-dev] " Christian Brauner 2023-01-30 9:10 ` Christian Brauner 2023-01-30 9:10 ` [Ocfs2-devel] " Christian Brauner via Ocfs2-devel 2023-01-30 9:16 ` Christoph Hellwig 2023-01-30 9:16 ` Christoph Hellwig 2023-01-30 9:16 ` Christoph Hellwig 2023-01-30 9:16 ` [f2fs-dev] " Christoph Hellwig 2023-01-30 9:16 ` [Ocfs2-devel] " Christoph Hellwig via Ocfs2-devel 2023-01-30 10:23 ` Christian Brauner 2023-01-30 10:23 ` Christian Brauner 2023-01-30 10:23 ` Christian Brauner 2023-01-30 10:23 ` [f2fs-dev] " Christian Brauner 2023-01-30 10:23 ` [Ocfs2-devel] " Christian Brauner via Ocfs2-devel
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20230125-fs-acl-remove-generic-xattr-handlers-v1-10-6cf155b492b6@kernel.org \ --to=brauner@kernel.org \ --cc=hch@lst.de \ --cc=linux-fsdevel@vger.kernel.org \ --cc=ocfs2-devel@oss.oracle.com \ --cc=sforshee@kernel.org \ --cc=viro@zeniv.linux.org.uk \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.