summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Behlendorf <[email protected]>2011-01-06 16:47:31 -0800
committerBrian Behlendorf <[email protected]>2011-02-10 09:21:42 -0800
commitbc3e15e386a62c29e10194e5fae3c4f8a76337df (patch)
tree8e1550bb641c88d2be6a125fe6bfb31b4bd97d6f
parent5649246dd3ba02041c83f7bab1c19c5815f9b771 (diff)
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.
-rw-r--r--module/zfs/zfs_vfsops.c2
1 files changed, 2 insertions, 0 deletions
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: