X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fzfs%2Fzfs_main.c;h=518000cf1e0fbee3a841568558edcba4643ec0bb;hb=750562833f5009e1602e3b7d8f10497ee683f611;hp=444869a47270c74e7e4828e16aa82be0078f8e4b;hpb=29b35200a7b3b0b803b69bb18f8435f4b9e66151;p=zfs.git

diff --git a/cmd/zfs/zfs_main.c b/cmd/zfs/zfs_main.c
index 444869a..518000c 100644
--- a/cmd/zfs/zfs_main.c
+++ b/cmd/zfs/zfs_main.c
@@ -2374,7 +2374,7 @@ zfs_do_userspace(int argc, char **argv)
 	boolean_t prtnum = B_FALSE;
 	boolean_t parseable = B_FALSE;
 	boolean_t sid2posix = B_FALSE;
-	int error;
+	int error = 0;
 	int c;
 	zfs_sort_column_t *default_sortcol = NULL;
 	zfs_sort_column_t *sortcol = NULL;
@@ -4457,7 +4457,7 @@ construct_fsacl_list(boolean_t un, struct allow_opts *opts, nvlist_t **nvlp)
 
 		while (curr < end) {
 			const char *who;
-			zfs_deleg_who_type_t who_type;
+			zfs_deleg_who_type_t who_type = ZFS_DELEG_WHO_UNKNOWN;
 			char *endch;
 			char *delim = strchr(curr, ',');
 			char errbuf[256];
@@ -5469,7 +5469,7 @@ share_mount(int op, int argc, char **argv)
 	int flags = 0;
 
 	/* check options */
-	while ((c = getopt(argc, argv, op == OP_MOUNT ? ":avo:" : "a"))
+	while ((c = getopt(argc, argv, op == OP_MOUNT ? ":avo:O" : "a"))
 	    != -1) {
 		switch (c) {
 		case 'a':
@@ -5491,7 +5491,9 @@ share_mount(int op, int argc, char **argv)
 			/* option validation is done later */
 			append_options(options, optarg);
 			break;
-
+		case 'O':
+			flags |= MS_OVERLAY;
+			break;
 		case ':':
 			(void) fprintf(stderr, gettext("missing argument for "
 			    "'%c' option\n"), optopt);