From b75b64ae4b5f90dc68ba6e65ef683d62650d40ba Mon Sep 17 00:00:00 2001
From: Andriy Gapon <avg@FreeBSD.org>
Date: Wed, 16 Oct 2019 06:07:21 +0000
Subject: 10165 libzpool: passing argument 1 to restrict-qualified parameter
aliases with argument 4
illumos/illumos-gate@f91fcf59ac2fd04f1816f3dcbc69a46d44276a65
https://github.com/illumos/illumos-gate/commit/f91fcf59ac2fd04f1816f3dcbc69a46d44276a65
https://www.illumos.org/issues/10165
Author: Toomas Soome <tsoome@me.com>
---
uts/common/fs/zfs/dsl_dataset.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/uts/common/fs/zfs/dsl_dataset.c b/uts/common/fs/zfs/dsl_dataset.c
index 3e85cf3fc31c..27873c0d4529 100644
--- a/uts/common/fs/zfs/dsl_dataset.c
+++ b/uts/common/fs/zfs/dsl_dataset.c
@@ -2130,7 +2130,10 @@ dsl_get_mountpoint(dsl_dataset_t *ds, const char *dsname, char *value,
return (error);
}
- /* Process the dsname and source to find the full mountpoint string */
+ /*
+ * Process the dsname and source to find the full mountpoint string.
+ * Can be skipped for 'legacy' or 'none'.
+ */
if (value[0] == '/') {
char *buf = kmem_alloc(ZAP_MAXVALUELEN, KM_SLEEP);
char *root = buf;
@@ -2181,10 +2184,8 @@ dsl_get_mountpoint(dsl_dataset_t *ds, const char *dsname, char *value,
relpath);
}
kmem_free(buf, ZAP_MAXVALUELEN);
- } else {
- /* 'legacy' or 'none' */
- (void) snprintf(value, ZAP_MAXVALUELEN, "%s", value);
}
+
return (0);
}
--
cgit v1.2.3