]> git.proxmox.com Git - mirror_zfs.git/commit
FreeBSD: fix merge error in zfs_acl_ids_create
authorMatthew Macy <mmacy@freebsd.org>
Mon, 17 Aug 2020 22:28:03 +0000 (15:28 -0700)
committerGitHub <noreply@github.com>
Mon, 17 Aug 2020 22:28:03 +0000 (15:28 -0700)
commitcfdc432e644912bbd7e026110ee57cc0f22ec321
tree23f3ce7db2ad5ee05051c89e5a77f004cca8c50c
parentb0099072dfc38c502222c47172469d7245027f35
FreeBSD: fix merge error in zfs_acl_ids_create

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Matt Macy <mmacy@FreeBSD.org>
Closes #10721
module/os/freebsd/zfs/zfs_acl.c