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

bdev/aio: Use bdev_open_ext() for rescan instead of bdev_get_by_name()

Browse Source 
Use spdk_bdev_open_ext() + spdk_bdev_desc_get_bdev() +
spdk_bdev_close() instead of spdk_bdev_get_by_name().

Additionally, use bdev pointer instead of &fdisk->disk because it is
more readable.

Signed-off-by: Shuhei Matsumoto <smatsumoto@nvidia.com>
Change-Id: I924595268e6785592a6e777e90a8c245a0346719
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/12070
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Shuhei Matsumoto 2022-03-29 16:23:40 +09:00 committed by Tomasz Zawadzki
parent 2515621184
commit d77d3179f0
3 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
module/bdev/aio/bdev_aio.c
View File

@ -820,36 +820,52 @@ error_return:
return rc; return rc;
} }
int static void
bdev_aio_rescan(struct spdk_bdev *bdev) dummy_bdev_event_cb(enum spdk_bdev_event_type type, struct spdk_bdev *bdev, void *ctx)
{ {
}
int
bdev_aio_rescan(const char *name)
{
struct spdk_bdev_desc *desc;
struct spdk_bdev *bdev;
struct file_disk *fdisk; struct file_disk *fdisk;
uint64_t disk_size, blockcnt; uint64_t disk_size, blockcnt;
int rc; int rc;
if (!bdev || bdev->module != &aio_if) { rc = spdk_bdev_open_ext(name, false, dummy_bdev_event_cb, NULL, &desc);
return -ENODEV; if (rc != 0) {
return rc;
}
bdev = spdk_bdev_desc_get_bdev(desc);
if (bdev->module != &aio_if) {
rc = -ENODEV;
goto exit;
} }
fdisk = SPDK_CONTAINEROF(bdev, struct file_disk, disk); fdisk = SPDK_CONTAINEROF(bdev, struct file_disk, disk);
disk_size = spdk_fd_get_size(fdisk->fd); disk_size = spdk_fd_get_size(fdisk->fd);
blockcnt = disk_size / fdisk->disk.blocklen; blockcnt = disk_size / bdev->blocklen;
if (fdisk->disk.blockcnt != blockcnt) { if (bdev->blockcnt != blockcnt) {
SPDK_NOTICELOG("AIO device is resized: bdev name %s, old block count %" PRIu64 ", new block count %" SPDK_NOTICELOG("AIO device is resized: bdev name %s, old block count %" PRIu64 ", new block count %"
PRIu64 "\n", PRIu64 "\n",
fdisk->filename, fdisk->filename,
fdisk->disk.blockcnt, bdev->blockcnt,
blockcnt); blockcnt);
rc = spdk_bdev_notify_blockcnt_change(&fdisk->disk, blockcnt); rc = spdk_bdev_notify_blockcnt_change(bdev, blockcnt);
if (rc != 0) { if (rc != 0) {
SPDK_ERRLOG("Could not change num blocks for aio bdev: name %s, errno: %d.\n", SPDK_ERRLOG("Could not change num blocks for aio bdev: name %s, errno: %d.\n",
fdisk->filename, rc); fdisk->filename, rc);
return rc; goto exit;
} }
} }
return 0; exit:
spdk_bdev_close(desc);
return rc;
} }
struct delete_aio_bdev_ctx { struct delete_aio_bdev_ctx {

2
module/bdev/aio/bdev_aio.h
View File

@ -41,7 +41,7 @@ typedef void (*delete_aio_bdev_complete)(void *cb_arg, int bdeverrno);
int create_aio_bdev(const char *name, const char *filename, uint32_t block_size); int create_aio_bdev(const char *name, const char *filename, uint32_t block_size);
int bdev_aio_rescan(struct spdk_bdev *bdev); int bdev_aio_rescan(const char *name);
void bdev_aio_delete(const char *name, delete_aio_bdev_complete cb_fn, void *cb_arg); void bdev_aio_delete(const char *name, delete_aio_bdev_complete cb_fn, void *cb_arg);
#endif /* SPDK_BDEV_AIO_H */ #endif /* SPDK_BDEV_AIO_H */

9
module/bdev/aio/bdev_aio_rpc.c
View File

@ -124,7 +124,6 @@ rpc_bdev_aio_rescan(struct spdk_jsonrpc_request *request,
const struct spdk_json_val *params) const struct spdk_json_val *params)
{ {
struct rpc_rescan_aio req = {NULL}; struct rpc_rescan_aio req = {NULL};
struct spdk_bdev *bdev;
int bdeverrno; int bdeverrno;
if (spdk_json_decode_object(params, rpc_rescan_aio_decoders, if (spdk_json_decode_object(params, rpc_rescan_aio_decoders,
@ -135,13 +134,7 @@ rpc_bdev_aio_rescan(struct spdk_jsonrpc_request *request,
goto cleanup; goto cleanup;
} }
bdev = spdk_bdev_get_by_name(req.name); bdeverrno = bdev_aio_rescan(req.name);
if (bdev == NULL) {
spdk_jsonrpc_send_error_response(request, -ENODEV, spdk_strerror(ENODEV));
goto cleanup;
}
bdeverrno = bdev_aio_rescan(bdev);
spdk_jsonrpc_send_bool_response(request, bdeverrno); spdk_jsonrpc_send_bool_response(request, bdeverrno);
cleanup: cleanup: