git://git.camperquake.de
/
zfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix executable permissions
[zfs.git]
/
cmd
/
zfs
/
zfs_main.c
diff --git
a/cmd/zfs/zfs_main.c
b/cmd/zfs/zfs_main.c
index
444869a
..
b88ab09
100644
(file)
--- 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;
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;
int c;
zfs_sort_column_t *default_sortcol = NULL;
zfs_sort_column_t *sortcol = NULL;
@@
-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)
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);
}
return (ret);
}
@@
-4457,7
+4457,7
@@
construct_fsacl_list(boolean_t un, struct allow_opts *opts, nvlist_t **nvlp)
while (curr < end) {
const char *who;
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];
char *endch;
char *delim = strchr(curr, ',');
char errbuf[256];
@@
-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))
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);
nvlist_free(nvl);
@@
-5469,7
+5469,7
@@
share_mount(int op, int argc, char **argv)
int flags = 0;
/* check options */
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':
!= -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;
/* 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);
case ':':
(void) fprintf(stderr, gettext("missing argument for "
"'%c' option\n"), optopt);