summaryrefslogtreecommitdiffstats
path: root/module/zcommon
diff options
context:
space:
mode:
authorTurbo Fredriksson <[email protected]>2014-07-25 12:42:00 +0200
committerBrian Behlendorf <[email protected]>2014-08-15 13:39:19 -0700
commitf67d709080f3d4a247191f0d25cbedc5da103f78 (patch)
tree5050bf2725b9ed94387e6901ea30325e0a16c1ae /module/zcommon
parent194e56234a58fa39c22aada5210f06ddf62c69d5 (diff)
Create an 'overlay' property
Add a new 'overlay' property (default 'off') that controls whether the filesystem should be mounted even if the mountpoint is busy or if it should fail with a 'mountpoint not empty'. Doing overlay mounts is the default mount behavior on Linux, but not in ZFS. It have been decided that following the ZFS behavior should be the default, but this overlay allows for site administrator to override this decision on a per-dataset basis. Signed-off-by: Turbo Fredriksson <[email protected]> Signed-off-by: Brian Behlendorf <[email protected]> Closes: #2503
Diffstat (limited to 'module/zcommon')
-rw-r--r--module/zcommon/zfs_prop.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/module/zcommon/zfs_prop.c b/module/zcommon/zfs_prop.c
index 77491cdb7..e60c4f7d4 100644
--- a/module/zcommon/zfs_prop.c
+++ b/module/zcommon/zfs_prop.c
@@ -295,6 +295,8 @@ zfs_prop_init(void)
zprop_register_index(ZFS_PROP_NBMAND, "nbmand", 0, PROP_INHERIT,
ZFS_TYPE_FILESYSTEM | ZFS_TYPE_SNAPSHOT, "on | off", "NBMAND",
boolean_table);
+ zprop_register_index(ZFS_PROP_OVERLAY, "overlay", 0, PROP_INHERIT,
+ ZFS_TYPE_FILESYSTEM, "on | off", "OVERLAY", boolean_table);
/* default index properties */
zprop_register_index(ZFS_PROP_VERSION, "version", 0, PROP_DEFAULT,