From: Ilya Dryomov <idryomov@gmail.com>
Date: Fri, 7 Mar 2025 20:07:49 +0000 (+0100)
Subject: Revert "test/librbd/fsx: switch to netlink interface for rbd-nbd"
X-Git-Tag: v18.2.5~24^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F62175%2Fhead;p=ceph.git

Revert "test/librbd/fsx: switch to netlink interface for rbd-nbd"

This reverts commit 1a128a8d8c5cc4313fa301db5381af9963940383.

With commit fcbf7367d285 ("rbd-nbd: map using netlink interface by
default") backported to reef, this reef-only fixup limited to fsx is no
longer needed.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
---

diff --git a/src/test/librbd/fsx.cc b/src/test/librbd/fsx.cc
index 74ece99fdeb..a59db783cad 100644
--- a/src/test/librbd/fsx.cc
+++ b/src/test/librbd/fsx.cc
@@ -1254,7 +1254,6 @@ nbd_open(const char *name, struct rbd_ctx *ctx)
 			   SubProcess::KEEP);
 	process.add_cmd_arg("map");
 	process.add_cmd_arg("--io-timeout=600");
-	process.add_cmd_arg("--try-netlink");
 	std::string img;
 	img.append(pool);
 	img.append("/");