Illumos #1951: leaking a vdev when removing an l2cache device

[zfs.git] / cmd / zfs / zfs_main.c

diff --git a/cmd/zfs/zfs_main.c b/cmd/zfs/zfs_main.c
index a052be5..b88ab09 100644 (file)
--- a/cmd/zfs/zfs_main.c
+++ b/cmd/zfs/zfs_main.c
@@ -2834,7 +2834,7 @@ zfs_do_list(int argc, char **argv)
        zfs_free_sort_columns(sortcol);
 
        if (ret == 0 && cb.cb_first && !cb.cb_scripted)
-               (void) printf(gettext("no datasets available\n"));
+               (void) fprintf(stderr, gettext("no datasets available\n"));
 
        return (ret);
 }
@@ -5139,7 +5139,7 @@ zfs_do_holds(int argc, char **argv)
        print_holds(scripted, cb.cb_max_namelen, cb.cb_max_taglen, nvl);
 
        if (nvlist_empty(nvl))
-               (void) printf(gettext("no datasets available\n"));
+               (void) fprintf(stderr, gettext("no datasets available\n"));
 
        nvlist_free(nvl);
 
@@ -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);