From bc3e15e386a62c29e10194e5fae3c4f8a76337df Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Thu, 6 Jan 2011 16:47:31 -0800 Subject: [PATCH] Wrap with HAVE_MLSLABEL The zfs_check_global_label() function is part of the HAVE_MLSLABEL support which was previously commented out by a HAVE_ZPL check. Since we're still deciding what to do about mls labels wrap it with the preexisting macro to keep it compiled out. --- module/zfs/zfs_vfsops.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/module/zfs/zfs_vfsops.c b/module/zfs/zfs_vfsops.c index 4e571ed6d..a97d0bdb7 100644 --- a/module/zfs/zfs_vfsops.c +++ b/module/zfs/zfs_vfsops.c @@ -1300,6 +1300,7 @@ zfs_parse_bootfs(char *bpath, char *outpath) return (error); } +#ifdef HAVE_MLSLABEL /* * zfs_check_global_label: * Check that the hex label string is appropriate for the dataset @@ -1327,6 +1328,7 @@ zfs_check_global_label(const char *dsname, const char *hexsl) } return (EACCES); } +#endif /* HAVE_MLSLABEL */ /* * zfs_mount_label_policy: