Merge branch 'refs/heads/upstream-HEAD' into repo-HEAD

Author: Delphix Engineering

src/kdumpfile/devmem.c

@@ -339,6 +339,9 @@ devmem_cleanup(struct kdump_shared *shared)
 {
 	struct devmem_priv *dmp = shared->fmtdata;
 
+	if (!dmp)
+		return;
+
 	if (dmp->ce) {
 		free(dmp->ce[0].data);
 		free(dmp->ce);

src/kdumpfile/diskdump.c

@@ -1101,14 +1101,13 @@ open_common(kdump_ctx_t *ctx, void *hdr)
 static void
 init_desc(kdump_ctx_t *ctx, char *desc)
 {
-	struct disk_dump_priv *ddp = ctx->shared->fmtdata;
 	unsigned fidx, nflat;
 
-	for (nflat = fidx = 0; fidx < ddp->num_files; ++fidx)
+	for (nflat = fidx = 0; fidx < get_num_files(ctx); ++fidx)
 		if (flatmap_isflattened(ctx->shared->flatmap, fidx))
 			++nflat;
 
-	if (nflat == ddp->num_files)
+	if (nflat == fidx)
 		strcpy(desc, "Flattened ");
 	else if (nflat)
 		strcpy(desc, "Mixed ");
@@ -1128,10 +1127,6 @@ diskdump_probe(kdump_ctx_t *ctx)
 	char desc[32];
 	kdump_status status;
 
-	status = init_private(ctx);
-	if (status != KDUMP_OK)
-		return status;
-
 	status = flatmap_pread(ctx->shared->flatmap, hdr, sizeof hdr, 0, 0);
 	if (status != KDUMP_OK)
 		return set_error(ctx, status, "Cannot read dump header");
@@ -1154,6 +1149,10 @@ diskdump_probe(kdump_ctx_t *ctx)
 		return set_error(ctx, status, "Cannot set %s",
 				 "file.description");
 
+	status = init_private(ctx);
+	if (status != KDUMP_OK)
+		return status;
+
 	return open_common(ctx, hdr);
 }
 

src/kdumpfile/lkcd.c

@@ -1070,6 +1070,9 @@ lkcd_cleanup(struct kdump_shared *shared)
 {
 	struct lkcd_priv *lkcdp = shared->fmtdata;
 
+	if (!lkcdp)
+		return;
+
 	free_level1(lkcdp->pfn_level1, lkcdp->l1_size);
 	mutex_destroy(&lkcdp->pfn_block_mutex);
 	if (lkcdp->cbuf_slot >= 0)

src/kdumpfile/open.c

@@ -338,6 +338,8 @@ open_dump(kdump_ctx_t *ctx)
 		ret = ctx->shared->ops->probe(ctx);
 		if (ret == KDUMP_OK)
 			return finish_open_dump(ctx);
+		if (ctx->shared->ops->cleanup)
+			ctx->shared->ops->cleanup(ctx->shared);
 		if (ret != KDUMP_NOPROBE)
 			return ret;