From 5cefef80395c9bba8bcdca38a8427f9825819d1e Mon Sep 17 00:00:00 2001 From: Shuhei Matsumoto Date: Tue, 12 Feb 2019 17:25:05 +0900 Subject: [PATCH] bdev/passthru: Use typedef in bdev_module.h for spdk_bdev_unregsister Including bdev_module.h and using spdk_bdev_unregister_cb instead of spdk_delete_passthru_complete will follow other bdev modules. This patch doesn't change any behavior. Change-Id: Ia236ea37ae22ed5c7740b02d1c5bd37491b9cf9a Signed-off-by: Shuhei Matsumoto Reviewed-on: https://review.gerrithub.io/c/444166 Tested-by: SPDK CI Jenkins Reviewed-by: Darek Stojaczyk Reviewed-by: Jim Harris --- lib/bdev/passthru/vbdev_passthru.c | 2 +- lib/bdev/passthru/vbdev_passthru.h | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/bdev/passthru/vbdev_passthru.c b/lib/bdev/passthru/vbdev_passthru.c index ab4d1069b..acbe20799 100644 --- a/lib/bdev/passthru/vbdev_passthru.c +++ b/lib/bdev/passthru/vbdev_passthru.c @@ -670,7 +670,7 @@ create_passthru_disk(const char *bdev_name, const char *vbdev_name) } void -delete_passthru_disk(struct spdk_bdev *bdev, spdk_delete_passthru_complete cb_fn, void *cb_arg) +delete_passthru_disk(struct spdk_bdev *bdev, spdk_bdev_unregister_cb cb_fn, void *cb_arg) { struct bdev_names *name; diff --git a/lib/bdev/passthru/vbdev_passthru.h b/lib/bdev/passthru/vbdev_passthru.h index 5705c4ed3..092e2249a 100644 --- a/lib/bdev/passthru/vbdev_passthru.h +++ b/lib/bdev/passthru/vbdev_passthru.h @@ -37,8 +37,7 @@ #include "spdk/stdinc.h" #include "spdk/bdev.h" - -typedef void (*spdk_delete_passthru_complete)(void *cb_arg, int bdeverrno); +#include "spdk/bdev_module.h" /** * Create new pass through bdev. @@ -56,7 +55,7 @@ int create_passthru_disk(const char *bdev_name, const char *vbdev_name); * \param cb_fn Function to call after deletion. * \param cb_arg Argument to pass to cb_fn. */ -void delete_passthru_disk(struct spdk_bdev *bdev, spdk_delete_passthru_complete cb_fn, +void delete_passthru_disk(struct spdk_bdev *bdev, spdk_bdev_unregister_cb cb_fn, void *cb_arg); #endif /* SPDK_VBDEV_PASSTHRU_H */