Skip to content

Commit

Permalink
zpl_xattr.c: Remove HAVE_XATTR_HANDLER_NAME
Browse files Browse the repository at this point in the history
`HAVE_XATTR_HANDLER_NAME` was removed in upstream commit 79c307d. Remove
it from our truenas branch as well.

Signed-off-by: Ameer Hamza <[email protected]>
  • Loading branch information
ixhamza committed Oct 7, 2024
1 parent a47536f commit ad9cfca
Showing 1 changed file with 0 additions and 10 deletions.
10 changes: 0 additions & 10 deletions module/os/linux/zfs/zpl_xattr.c
Original file line number Diff line number Diff line change
Expand Up @@ -1749,12 +1749,6 @@ __zpl_xattr_nfs41acl_get(struct inode *ip, const char *name,
int ret, fl;
size_t xdr_size;

/* xattr_resolve_name will do this for us if this is defined */
#ifndef HAVE_XATTR_HANDLER_NAME
if (strcmp(name, "") != 0)
return (-EINVAL);
#endif

if (ITOZSB(ip)->z_acl_type != ZFS_ACLTYPE_NFSV4)
return (-EOPNOTSUPP);

Expand Down Expand Up @@ -1868,11 +1862,7 @@ ZPL_XATTR_SET_WRAPPER(zpl_xattr_nfs41acl_set);
*/
xattr_handler_t zpl_xattr_nfs41acl_handler =
{
#ifdef HAVE_XATTR_HANDLER_NAME
.name = NFS41ACL_XATTR,
#else
.prefix = NFS41ACL_XATTR,
#endif
.list = zpl_xattr_nfs41acl_list,
.get = zpl_xattr_nfs41acl_get,
.set = zpl_xattr_nfs41acl_set,
Expand Down

0 comments on commit ad9cfca

Please sign in to comment.