git://git.camperquake.de
/
zfs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5649246
)
Wrap with HAVE_MLSLABEL
author
Brian Behlendorf
<behlendorf1@llnl.gov>
Fri, 7 Jan 2011 00:47:31 +0000
(16:47 -0800)
committer
Brian Behlendorf
<behlendorf1@llnl.gov>
Thu, 10 Feb 2011 17:21:42 +0000
(09:21 -0800)
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
patch
|
blob
|
history
diff --git
a/module/zfs/zfs_vfsops.c
b/module/zfs/zfs_vfsops.c
index
4e571ed
..
a97d0bd
100644
(file)
--- 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: