Commit 08daa447 authored by Daniel Verkamp's avatar Daniel Verkamp
Browse files

blob: remove deprecated bs_io_*_blob functions 



These were marked as deprecated in v18.04 and scheduled for removal in
v18.07.

Change-Id: I2587bcaf89cdcc757ad902ac42ccd9adce9c8f92
Signed-off-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Reviewed-on: https://review.gerrithub.io/410727


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent cc8bb51b

include/spdk/blob.h

+0 −23
Original line number Diff line number Diff line
@@ -640,29 +640,6 @@ void spdk_blob_io_unmap(struct spdk_blob *blob, struct spdk_io_channel *channel, 
void spdk_blob_io_write_zeroes(struct spdk_blob *blob, struct spdk_io_channel *channel,

			       uint64_t offset, uint64_t length, spdk_blob_op_complete cb_fn, void *cb_arg);



/*

 * The following spdk_bs_io prefixed functions are deprecated in favor of their corresponding spdk_blob_io

 * function above.

 */

void spdk_bs_io_write_blob(struct spdk_blob *blob, struct spdk_io_channel *channel,

			   void *payload, uint64_t offset, uint64_t length,

			   spdk_blob_op_complete cb_fn, void *cb_arg) __attribute__((deprecated));

void spdk_bs_io_read_blob(struct spdk_blob *blob, struct spdk_io_channel *channel,

			  void *payload, uint64_t offset, uint64_t length,

			  spdk_blob_op_complete cb_fn, void *cb_arg) __attribute__((deprecated));

void spdk_bs_io_writev_blob(struct spdk_blob *blob, struct spdk_io_channel *channel,

			    struct iovec *iov, int iovcnt, uint64_t offset, uint64_t length,

			    spdk_blob_op_complete cb_fn, void *cb_arg) __attribute__((deprecated));

void spdk_bs_io_readv_blob(struct spdk_blob *blob, struct spdk_io_channel *channel,

			   struct iovec *iov, int iovcnt, uint64_t offset, uint64_t length,

			   spdk_blob_op_complete cb_fn, void *cb_arg) __attribute__((deprecated));

void spdk_bs_io_unmap_blob(struct spdk_blob *blob, struct spdk_io_channel *channel,

			   uint64_t offset, uint64_t length,

			   spdk_blob_op_complete cb_fn, void *cb_arg)  __attribute__((deprecated));

void spdk_bs_io_write_zeroes_blob(struct spdk_blob *blob, struct spdk_io_channel *channel,

				  uint64_t offset, uint64_t length,

				  spdk_blob_op_complete cb_fn, void *cb_arg)  __attribute__((deprecated));



/**

 * Get the first blob of the blobstore. The obtained blob will be passed to

 * the callback function.

lib/blob/blobstore.c

+0 −40
Original line number Diff line number Diff line
@@ -4675,46 +4675,6 @@ void spdk_blob_io_readv(struct spdk_blob *blob, struct spdk_io_channel *channel, 
	_spdk_blob_request_submit_rw_iov(blob, channel, iov, iovcnt, offset, length, cb_fn, cb_arg, true);

}



void spdk_bs_io_unmap_blob(struct spdk_blob *blob, struct spdk_io_channel *channel,

			   uint64_t offset, uint64_t length, spdk_blob_op_complete cb_fn, void *cb_arg)

{

	spdk_blob_io_unmap(blob, channel, offset, length, cb_fn, cb_arg);

}



void spdk_bs_io_write_zeroes_blob(struct spdk_blob *blob, struct spdk_io_channel *channel,

				  uint64_t offset, uint64_t length, spdk_blob_op_complete cb_fn, void *cb_arg)

{

	spdk_blob_io_write_zeroes(blob, channel, offset, length, cb_fn, cb_arg);

}



void spdk_bs_io_write_blob(struct spdk_blob *blob, struct spdk_io_channel *channel,

			   void *payload, uint64_t offset, uint64_t length,

			   spdk_blob_op_complete cb_fn, void *cb_arg)

{

	spdk_blob_io_write(blob, channel, payload, offset, length, cb_fn, cb_arg);

}



void spdk_bs_io_read_blob(struct spdk_blob *blob, struct spdk_io_channel *channel,

			  void *payload, uint64_t offset, uint64_t length,

			  spdk_blob_op_complete cb_fn, void *cb_arg)

{

	spdk_blob_io_read(blob, channel, payload, offset, length, cb_fn, cb_arg);

}



void spdk_bs_io_writev_blob(struct spdk_blob *blob, struct spdk_io_channel *channel,

			    struct iovec *iov, int iovcnt, uint64_t offset, uint64_t length,

			    spdk_blob_op_complete cb_fn, void *cb_arg)

{

	spdk_blob_io_writev(blob, channel, iov, iovcnt, offset, length, cb_fn, cb_arg);

}



void spdk_bs_io_readv_blob(struct spdk_blob *blob, struct spdk_io_channel *channel,

			   struct iovec *iov, int iovcnt, uint64_t offset, uint64_t length,

			   spdk_blob_op_complete cb_fn, void *cb_arg)

{

	spdk_blob_io_readv(blob, channel, iov, iovcnt, offset, length, cb_fn, cb_arg);

}



struct spdk_bs_iter_ctx {

	int64_t page_num;

	struct spdk_blob_store *bs;