Commit ae5a01dd authored by Jim Harris's avatar Jim Harris
Browse files

blob: change spdk_bs_iter_next parameter to spdk_blob * 



Similar to previous change, the ** paradigm is a bit
problematic for asynchronous routines that could fail.

Signed-off-by: default avatarJim Harris <james.r.harris@intel.com>
Change-Id: Ife7748280482356c4c51a796817b71cd7bc7e479

Reviewed-on: https://review.gerrithub.io/391483


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
parent e734bb9f

CHANGELOG.md

+3 −0
Original line number Diff line number Diff line
@@ -59,6 +59,9 @@ spdk_bs_md_iter_next => spdk_bs_iter_next 
The function signature of spdk_blob_close has changed.  It now takes a struct spdk_blob * argument

rather than struct spdk_blob **.



The function signature of spdk_bs_iter_next has changed.  It now takes a struct spdk_blob * argument

rather than struct spdk_blob **.



## v17.10: Logical Volumes



### New dependencies

examples/blob/cli/blobcli.c

+1 −1
Original line number Diff line number Diff line
@@ -519,7 +519,7 @@ blob_iter_cb(void *arg1, struct spdk_blob *blob, int bserrno) 
		show_blob(cli_context);

	}



	spdk_bs_iter_next(cli_context->bs, &blob, blob_iter_cb, cli_context);

	spdk_bs_iter_next(cli_context->bs, blob, blob_iter_cb, cli_context);

}



/*

include/spdk/blob.h

+1 −1
Original line number Diff line number Diff line
@@ -269,7 +269,7 @@ void spdk_bs_io_write_zeroes_blob(struct spdk_blob *blob, struct spdk_io_channel 
/* Iterate through all blobs */

void spdk_bs_iter_first(struct spdk_blob_store *bs,

			spdk_blob_op_with_handle_complete cb_fn, void *cb_arg);

void spdk_bs_iter_next(struct spdk_blob_store *bs, struct spdk_blob **blob,

void spdk_bs_iter_next(struct spdk_blob_store *bs, struct spdk_blob *blob,

		       spdk_blob_op_with_handle_complete cb_fn, void *cb_arg);



int spdk_blob_set_xattr(struct spdk_blob *blob, const char *name, const void *value,

lib/blob/blobstore.c

+3 −3
Original line number Diff line number Diff line
@@ -2998,14 +2998,14 @@ _spdk_bs_iter_close_cpl(void *cb_arg, int bserrno) 
}



void

spdk_bs_iter_next(struct spdk_blob_store *bs, struct spdk_blob **b,

spdk_bs_iter_next(struct spdk_blob_store *bs, struct spdk_blob *b,

		  spdk_blob_op_with_handle_complete cb_fn, void *cb_arg)

{

	struct spdk_bs_iter_ctx *ctx;

	struct spdk_blob_data	*blob;



	assert(b != NULL);

	blob = __blob_to_data(*b);

	blob = __blob_to_data(b);

	assert(blob != NULL);



	ctx = calloc(1, sizeof(*ctx));
@@ -3020,7 +3020,7 @@ spdk_bs_iter_next(struct spdk_blob_store *bs, struct spdk_blob **b, 
	ctx->cb_arg = cb_arg;



	/* Close the existing blob */

	spdk_blob_close(*b, _spdk_bs_iter_close_cpl, ctx);

	spdk_blob_close(b, _spdk_bs_iter_close_cpl, ctx);

}



int

lib/blobfs/blobfs.c

+1 −1
Original line number Diff line number Diff line
@@ -626,7 +626,7 @@ iter_cb(void *ctx, struct spdk_blob *blob, int rc) 
		TAILQ_INSERT_TAIL(&args->op.fs_load.deleted_files, deleted_file, tailq);

	}



	spdk_bs_iter_next(fs->bs, &blob, iter_cb, req);

	spdk_bs_iter_next(fs->bs, blob, iter_cb, req);

}



static void