diff --git a/include/spdk/blob.h b/include/spdk/blob.h index 44c7f10a9..38c6140e3 100644 --- a/include/spdk/blob.h +++ b/include/spdk/blob.h @@ -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. diff --git a/lib/blob/blobstore.c b/lib/blob/blobstore.c index aad1506f2..e0f09eeff 100644 --- a/lib/blob/blobstore.c +++ b/lib/blob/blobstore.c @@ -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;