From 7a811ac8a924b1e1de9d1c66ea150761c798cdd2 Mon Sep 17 00:00:00 2001 From: Ilya Dryomov Date: Thu, 9 Jul 2020 22:27:41 +0200 Subject: [PATCH] test/librbd/fsx: respect rbd_default_map_options in krbd_open() Signed-off-by: Ilya Dryomov (cherry picked from commit b29dfc4624f3b8286d345ec62894fa70c5f6cf9b) --- src/test/librbd/fsx.cc | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/test/librbd/fsx.cc b/src/test/librbd/fsx.cc index cee2a08960223..a928df5cce4e2 100644 --- a/src/test/librbd/fsx.cc +++ b/src/test/librbd/fsx.cc @@ -949,6 +949,7 @@ const struct rbd_operations librbd_operations = { int krbd_open(const char *name, struct rbd_ctx *ctx) { + char buf[1024]; char *devnode; int fd; int ret; @@ -957,7 +958,14 @@ krbd_open(const char *name, struct rbd_ctx *ctx) if (ret < 0) return ret; - ret = krbd_map(krbd, pool, "", name, "", "", &devnode); + ret = rados_conf_get(cluster, "rbd_default_map_options", buf, + sizeof(buf)); + if (ret < 0) { + simple_err("Could not get rbd_default_map_options value", ret); + return ret; + } + + ret = krbd_map(krbd, pool, "", name, "", buf, &devnode); if (ret < 0) { prt("krbd_map(%s) failed\n", name); return ret; -- 2.39.5