summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Behlendorf <behlendorf1@llnl.gov>2011-02-16 11:05:55 -0800
committerBrian Behlendorf <behlendorf1@llnl.gov>2011-02-16 11:05:55 -0800
commit07bd86718b74b2d8e0f633f1b80e976892eaf329 (patch)
tree2ae415e80a637cdd7adef660bf7f00ecebc3c04a
parenta6695d83b763aaeeeeb6d4bdb57ed59a384106f7 (diff)
Suppress share error on mount
Until code is added to support automatically sharing datasets we should return success instead of failure. This prevents the command line tools from returning a non-zero error code. While a user likely won't notice this, test scripts like zconfig.sh do and correctly fail because of it.
-rw-r--r--lib/libzfs/libzfs_mount.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/libzfs/libzfs_mount.c b/lib/libzfs/libzfs_mount.c
index f55b16bdc..f8f12d1bf 100644
--- a/lib/libzfs/libzfs_mount.c
+++ b/lib/libzfs/libzfs_mount.c
@@ -797,8 +797,9 @@ zfs_share_proto(zfs_handle_t *zhp, zfs_share_proto_t *proto)
dgettext(TEXT_DOMAIN, "cannot share '%s': %s"),
zfs_get_name(zhp), _sa_errorstr != NULL ?
_sa_errorstr(ret) : "");
-#endif /* HAVE_SHARE */
return (-1);
+#endif /* HAVE_SHARE */
+ return (0);
}
for (curr_proto = proto; *curr_proto != PROTO_END; curr_proto++) {