ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bdev/daos: Use bdev_unregister_by_name() to delete a daos bdev

Browse Source 
Signed-off-by: Shuhei Matsumoto <smatsumoto@nvidia.com>
Change-Id: I8e73d0d8e6cfa76f253f5cd49b3bf37d42d44b6f
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/16557
Reviewed-by: Aleksey Marchuk <alexeymar@nvidia.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: John Kariuki <John.K.Kariuki@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
This commit is contained in:
Shuhei Matsumoto 2023-01-27 11:14:10 +09:00 committed by Jim Harris
parent 2bb2afd085
commit 916fb46915
3 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
module/bdev/daos/bdev_daos.c
View File

@ -808,14 +808,14 @@ exit:
} }
void void
delete_bdev_daos(struct spdk_bdev *bdev, spdk_delete_daos_complete cb_fn, void *cb_arg) delete_bdev_daos(const char *bdev_name, spdk_bdev_unregister_cb cb_fn, void *cb_arg)
{ {
if (!bdev || bdev->module != &daos_if) { int rc;
cb_fn(cb_arg, -ENODEV);
return;
}
spdk_bdev_unregister(bdev, cb_fn, cb_arg); rc = spdk_bdev_unregister_by_name(bdev_name, &daos_if, cb_fn, cb_arg);
if (rc != 0) {
cb_fn(cb_arg, rc);
}
} }
static int static int

5
module/bdev/daos/bdev_daos.h
View File

@ -8,14 +8,13 @@
#include "spdk/stdinc.h" #include "spdk/stdinc.h"
#include "spdk/bdev.h" #include "spdk/bdev.h"
#include "spdk/bdev_module.h"
typedef void (*spdk_delete_daos_complete)(void *cb_arg, int bdeverrno);
int create_bdev_daos(struct spdk_bdev **bdev, const char *name, const struct spdk_uuid *uuid, int create_bdev_daos(struct spdk_bdev **bdev, const char *name, const struct spdk_uuid *uuid,
const char *pool, const char *cont, const char *oclass, const char *pool, const char *cont, const char *oclass,
uint64_t num_blocks, uint32_t block_size); uint64_t num_blocks, uint32_t block_size);
void delete_bdev_daos(struct spdk_bdev *bdev, spdk_delete_daos_complete cb_fn, void *cb_arg); void delete_bdev_daos(const char *bdev_name, spdk_bdev_unregister_cb cb_fn, void *cb_arg);
/** /**
* Resize DAOS bdev. * Resize DAOS bdev.

10
module/bdev/daos/bdev_daos_rpc.c
View File

@ -121,7 +121,6 @@ rpc_bdev_daos_delete(struct spdk_jsonrpc_request *request,
const struct spdk_json_val *params) const struct spdk_json_val *params)
{ {
struct rpc_delete_daos req = {NULL}; struct rpc_delete_daos req = {NULL};
struct spdk_bdev *bdev;
if (spdk_json_decode_object(params, rpc_delete_daos_decoders, if (spdk_json_decode_object(params, rpc_delete_daos_decoders,
SPDK_COUNTOF(rpc_delete_daos_decoders), SPDK_COUNTOF(rpc_delete_daos_decoders),
@ -132,14 +131,7 @@ rpc_bdev_daos_delete(struct spdk_jsonrpc_request *request,
goto cleanup; goto cleanup;
} }
bdev = spdk_bdev_get_by_name(req.name); delete_bdev_daos(req.name, rpc_bdev_daos_delete_cb, request);
if (bdev == NULL) {
SPDK_INFOLOG(bdev_daos, "bdev '%s' does not exist\n", req.name);
spdk_jsonrpc_send_error_response(request, -ENODEV, spdk_strerror(ENODEV));
goto cleanup;
}
delete_bdev_daos(bdev, rpc_bdev_daos_delete_cb, request);
cleanup: cleanup:
free_rpc_delete_daos(&req); free_rpc_delete_daos(&req);