summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorEric Dillmann <[email protected]>2013-02-14 00:11:59 +0100
committerBrian Behlendorf <[email protected]>2013-03-05 12:37:54 -0800
commit0b4d1b5853791e1e447d74f0b229800d65b53071 (patch)
tree9d908b32fb62c3f9549de128195bdf67c6d50a7e /include
parenta4430fce691d492aec382de0dfa937c05ee16500 (diff)
Add snapdev=[hidden|visible] dataset property
The new snapdev dataset property may be set to control the visibility of zvol snapshot devices. By default this value is set to 'hidden' which will prevent zvol snapshots from appearing under /dev/zvol/ and /dev/<dataset>/. When set to 'visible' all zvol snapshots for the dataset will be visible. This functionality was largely added because when automatic snapshoting is enabled large numbers of read-only zvol snapshots will be created. When creating these devices the kernel will attempt to read their partition tables, and blkid will attempt to identify any filesystems on those partitions. This leads to a variety of issues: 1) The zvol partition tables will be read in the context of the `modprobe zfs` for automatically imported pools. This is undesirable and should be done asynchronously, but for now reducing the number of visible devices helps. 2) Udev expects to be able to complete its work for a new block devices fairly quickly. When many zvol devices are added at the same time this is no longer be true. It can lead to udev timeouts and missing /dev/zvol links. 3) Simply having lots of devices in /dev/ can be aukward from a management standpoint. Hidding the devices your unlikely to ever use helps with this. Any snapshot device which is needed can be made visible by changing the snapdev property. NOTE: This patch changes the default behavior for zvols which was effectively 'snapdev=visible'. Signed-off-by: Brian Behlendorf <[email protected]> Closes #1235 Closes #945 Issue #956 Issue #756
Diffstat (limited to 'include')
-rw-r--r--include/sys/fs/zfs.h1
-rw-r--r--include/sys/zfs_ioctl.h6
-rw-r--r--include/sys/zvol.h1
3 files changed, 8 insertions, 0 deletions
diff --git a/include/sys/fs/zfs.h b/include/sys/fs/zfs.h
index 137dd39e6..8c949e767 100644
--- a/include/sys/fs/zfs.h
+++ b/include/sys/fs/zfs.h
@@ -128,6 +128,7 @@ typedef enum {
ZFS_PROP_REFRATIO,
ZFS_PROP_WRITTEN,
ZFS_PROP_CLONES,
+ ZFS_PROP_SNAPDEV,
ZFS_NUM_PROPS
} zfs_prop_t;
diff --git a/include/sys/zfs_ioctl.h b/include/sys/zfs_ioctl.h
index 4e5c5fba2..740d8eda4 100644
--- a/include/sys/zfs_ioctl.h
+++ b/include/sys/zfs_ioctl.h
@@ -47,6 +47,12 @@ extern "C" {
#define ZFS_SNAPDIR_VISIBLE 1
/*
+ * Property values for snapdev
+ */
+#define ZFS_SNAPDEV_HIDDEN 0
+#define ZFS_SNAPDEV_VISIBLE 1
+
+/*
* Field manipulation macros for the drr_versioninfo field of the
* send stream header.
*/
diff --git a/include/sys/zvol.h b/include/sys/zvol.h
index 185d64523..c05f81a5f 100644
--- a/include/sys/zvol.h
+++ b/include/sys/zvol.h
@@ -44,6 +44,7 @@ extern int zvol_remove_minor(const char *);
extern void zvol_remove_minors(const char *);
extern int zvol_set_volsize(const char *, uint64_t);
extern int zvol_set_volblocksize(const char *, uint64_t);
+extern int zvol_set_snapdev(const char *, uint64_t);
extern int zvol_init(void);
extern void zvol_fini(void);