Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch

openzfs · Aug 12, 2010 · 9a5afe4 · 9a5afe4
2 parents e9d058e + 0877821
commit 9a5afe4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/cmd/ztest/ztest.c b/cmd/ztest/ztest.c
@@ -4903,12 +4903,16 @@ ztest_run_zdb(char *pool)
 	zdb = umem_alloc(MAXPATHLEN + MAXNAMELEN + 20, UMEM_NOFAIL);
 	zbuf = umem_alloc(1024, UMEM_NOFAIL);
 
-	/* Designed to be run exclusively in the development tree */
 	VERIFY(realpath(getexecname(), bin) != NULL);
-	strstr(bin, "/ztest/")[0] = '\0';
+	if (strncmp(bin, "/usr/sbin/ztest", 14) == 0) {
+		strcpy(bin, "/usr/sbin/zdb"); /* Installed */
+	} else {
+		strstr(bin, "/ztest/")[0] = '\0'; /* In-tree */
+		strcat(bin, "/zdb/zdb");
+	}
 
 	(void) sprintf(zdb,
-	    "%s/zdb/zdb -bcc%s%s -U /tmp/zpool.cache %s",
+	    "%s -bcc%s%s -U %s %s",
 	    bin,
 	    zopt_verbose >= 3 ? "s" : "",
 	    zopt_verbose >= 4 ? "v" : "",

diff --git a/module/zfs/spa.c b/module/zfs/spa.c
@@ -1270,7 +1270,7 @@ load_nvlist(spa_t *spa, uint64_t obj, nvlist_t **value)
 	nvsize = *(uint64_t *)db->db_data;
 	dmu_buf_rele(db, FTAG);
 
-	packed = kmem_alloc(nvsize, KM_SLEEP);
+	packed = kmem_alloc(nvsize, KM_SLEEP | KM_NODEBUG);
 	error = dmu_read(spa->spa_meta_objset, obj, 0, nvsize, packed,
 	    DMU_READ_PREFETCH);
 	if (error == 0)

diff --git a/module/zfs/zfs_ioctl.c b/module/zfs/zfs_ioctl.c
@@ -908,7 +908,7 @@ get_nvlist(uint64_t nvl, uint64_t size, int iflag, nvlist_t **nvp)
 	if (size == 0)
 		return (EINVAL);
 
-	packed = kmem_alloc(size, KM_SLEEP);
+	packed = kmem_alloc(size, KM_SLEEP | KM_NODEBUG);
 
 	if ((error = ddi_copyin((void *)(uintptr_t)nvl, packed, size,
 	    iflag)) != 0) {