FreeBSD: Don't force xattr mount option

The kernel will use the xattr property by default when not overridden
by a mount option.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Alexander Motin <mav@FreeBSD.org>
Signed-off-by: Ryan Moeller <ryan@iXsystems.com>
Closes #11997

diff --git a/lib/libzfs/os/freebsd/libzfs_zmount.c b/lib/libzfs/os/freebsd/libzfs_zmount.c
index e114b1e0ca6fcd1e47a454998878c1c8b115028c..699d330ebdb4e4fcf1a4ecabcbe9f2342e61ed71 100644 (file)
--- a/lib/libzfs/os/freebsd/libzfs_zmount.c
+++ b/lib/libzfs/os/freebsd/libzfs_zmount.c
@@ -97,11 +97,6 @@ do_mount_(const char *spec, const char *dir, int mflag, char *fstype,
        iovlen = 0;
        if (strstr(optstr, MNTOPT_REMOUNT) != NULL)
                build_iovec(&iov, &iovlen, "update", NULL, 0);
-       if (strstr(optstr, MNTOPT_NOXATTR) == NULL &&
-           strstr(optstr, MNTOPT_XATTR) == NULL &&
-           strstr(optstr, MNTOPT_SAXATTR) == NULL &&
-           strstr(optstr, MNTOPT_DIRXATTR) == NULL)
-               build_iovec(&iov, &iovlen, "xattr", NULL, 0);
        if (mflag & MS_RDONLY)
                build_iovec(&iov, &iovlen, "ro", NULL, 0);
        build_iovec(&iov, &iovlen, "fstype", fstype, (size_t)-1);