From 6affaf77d970755af0767019ab79bc676eec4719 Mon Sep 17 00:00:00 2001
From: "Raphael S. Carvalho" <raphaelsc@cloudius-systems.com>
Date: Wed, 27 Nov 2013 22:27:35 -0200
Subject: [PATCH] zfs: Fix debug mode build
The undefined reference error only shows up when building OSv on debug
mode (mode=debug):
bsd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.o: In function `zfs_setattr':
bsd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c:2529: undefined reference to `zfs_xvattr_set
Signed-off-by: Raphael S. Carvalho <raphaelsc@cloudius-systems.com>
Signed-off-by: Pekka Enberg <penberg@cloudius-systems.com>
---
.../cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/bsd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c b/bsd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
index 42c9d895f..f6f2f68b6 100644
--- a/bsd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
+++ b/bsd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
@@ -2496,7 +2496,7 @@ top:
* Do this after setting timestamps to prevent timestamp
* update from toggling bit
*/
-
+#ifndef __OSV__
if (xoap && (mask & AT_XVATTR)) {
/*
@@ -2528,7 +2528,7 @@ top:
zfs_xvattr_set(zp, xvap, tx);
}
-
+#endif
if (fuid_dirtied)
zfs_fuid_sync(zfsvfs, tx);
--
GitLab