Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 16 Oct 2019 06:09:00 +0000 (UTC)
From:      Andriy Gapon <avg@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r353609 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
Message-ID:  <201910160609.x9G690pf065747@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: avg
Date: Wed Oct 16 06:09:00 2019
New Revision: 353609
URL: https://svnweb.freebsd.org/changeset/base/353609

Log:
  MFV r353608: 10165 libzpool: passing argument 1 to restrict-qualified parameter
  
  illumos/illumos-gate@f91fcf59ac2fd04f1816f3dcbc69a46d44276a65
  https://github.com/illumos/illumos-gate/commit/f91fcf59ac2fd04f1816f3dcbc69a46d44276a65
  
  https://www.illumos.org/issues/10165
  
  Author: Toomas Soome <tsoome@me.com>
  MFC after:	10 days

Modified:
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c
Directory Properties:
  head/sys/cddl/contrib/opensolaris/   (props changed)

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c	Wed Oct 16 06:07:21 2019	(r353608)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c	Wed Oct 16 06:09:00 2019	(r353609)
@@ -2196,7 +2196,10 @@ dsl_get_mountpoint(dsl_dataset_t *ds, const char *dsna
 		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;
@@ -2247,10 +2250,8 @@ dsl_get_mountpoint(dsl_dataset_t *ds, const char *dsna
 			    relpath);
 		}
 		kmem_free(buf, ZAP_MAXVALUELEN);
-	} else {
-		/* 'legacy' or 'none' */
-		(void) snprintf(value, ZAP_MAXVALUELEN, "%s", value);
 	}
+
 	return (0);
 }
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201910160609.x9G690pf065747>