bcachefs: drop unused posix acl handlers
PATCH 1/2 bcachefs: drop unused posix acl handlers
From: Youling Tang <[email protected]>
Remove struct nop_posix_acl_{access,default} for bcachefs filesystem that don't depend on the xattr handler in their inode->i_op->listxattr() method in any way. There's nothing more to do than to simply remove the handler. It's been effectively unused ever since we introduced the new posix acl api. See [1] for details.
Signed-off-by Youling Tang <[email protected]>
--- fs/bcachefs/xattr.c | 4 ---- 1 file changed, 4 deletions(-)
fs/bcachefs/xattr.c +0 -4
@@ -623,10 +623,6 @@ static const struct xattr_handler bch_xattr_bcachefs_effective_handler = {const struct xattr_handler *bch2_xattr_handlers[] = { &bch_xattr_user_handler, -#ifdef CONFIG_BCACHEFS_POSIX_ACL - &nop_posix_acl_access, - &nop_posix_acl_default, -#endif &bch_xattr_trusted_handler, &bch_xattr_security_handler, #ifndef NO_BCACHEFS_FS
Signature · 1 line
2.34.1
PATCH 2/2 bcachefs: Simplify bch2_xattr_emit() implementation
From: Youling Tang <[email protected]>
Use helper functions to make code more readable.
Similar to commit a5488f29835c ("fs: simplify ->listxattr() implementation")
Signed-off-by Youling Tang <[email protected]>
--- fs/bcachefs/xattr.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-)
fs/bcachefs/xattr.c +16 -6
@@ -251,17 +251,27 @@ static int __bch2_xattr_emit(const char *prefix,return 0 ; } +static inline const char *bch2_xattr_prefix (unsigned type,struct dentry *dentry) +{ +const struct xattr_handler *handler =bch2_xattr_type_to_handler (type); + +if (!xattr_handler_can_list (handler, dentry)) +return NULL ; + +return xattr_prefix (handler); +} +static int bch2_xattr_emit (struct dentry *dentry,const struct bch_xattr *xattr,struct xattr_buf *buf) { -const struct xattr_handler *handler = -bch2_xattr_type_to_handler (xattr->x_type); +const char *prefix; + + prefix =bch2_xattr_prefix (xattr->x_type, dentry); +if (!prefix) +return 0 ; -return handler && (!handler->list || handler->list (dentry)) - ?__bch2_xattr_emit (handler->prefix ?: handler->name, - xattr->x_name, xattr->x_name_len, buf) - :0 ; +return __bch2_xattr_emit (prefix, xattr->x_name, xattr->x_name_len, buf); } static int bch2_xattr_list_bcachefs(struct bch_fs *c,
Signature · 1 line
2.34.1