From b16a4c22c43ff485771e016d13e57a4d034603cb Mon Sep 17 00:00:00 2001 From: Denis Barakhtanov Date: Mon, 24 Apr 2023 10:59:41 +1000 Subject: [PATCH] bdev/daos: using SPDK_CONTAINEROF instead of container_of DAOS bdev was implicitly expecting `container_of` to be in daos_event.h With upcoming DAOS release the location of `container_of` has changed. `SPDK_CONTAINEROF` is now used in the module. Signed-off-by: Denis Barakhtanov Change-Id: Ia88365322fef378af6b1708b8704827bca1b828d Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/17719 Tested-by: SPDK CI Jenkins Reviewed-by: Konrad Sztyber Reviewed-by: Jim Harris --- module/bdev/daos/bdev_daos.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/bdev/daos/bdev_daos.c b/module/bdev/daos/bdev_daos.c index 02c4d43fc..050152590 100644 --- a/module/bdev/daos/bdev_daos.c +++ b/module/bdev/daos/bdev_daos.c @@ -437,7 +437,7 @@ bdev_daos_channel_poll(void *arg) } for (int i = 0; i < rc; ++i) { - struct bdev_daos_task *task = container_of(evp[i], struct bdev_daos_task, ev); + struct bdev_daos_task *task = SPDK_CONTAINEROF(evp[i], struct bdev_daos_task, ev); enum spdk_bdev_io_status status = SPDK_BDEV_IO_STATUS_SUCCESS; assert(task != NULL);