From 37aa18858b38cee61e122adc0a1834ca797ea84f Mon Sep 17 00:00:00 2001 From: Pan Liu Date: Sat, 11 Mar 2017 21:50:00 +0800 Subject: [PATCH] rbd-nbd: only try to load nbd module once when open nbd device, during do_map operation. Signed-off-by: Pan Liu --- src/tools/rbd_nbd/rbd-nbd.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/tools/rbd_nbd/rbd-nbd.cc b/src/tools/rbd_nbd/rbd-nbd.cc index c0962370836..71f3ba08043 100644 --- a/src/tools/rbd_nbd/rbd-nbd.cc +++ b/src/tools/rbd_nbd/rbd-nbd.cc @@ -562,10 +562,12 @@ static int do_map(int argc, const char *argv[]) if (devpath.empty()) { char dev[64]; + bool try_load_module = true; while (true) { snprintf(dev, sizeof(dev), "/dev/nbd%d", index); - nbd = open_device(dev, true); + nbd = open_device(dev, try_load_module); + try_load_module = false; if (nbd < 0) { r = nbd; cerr << "rbd-nbd: failed to find unused device" << std::endl; -- 2.39.5