From fb0f1986449b53908a6d17d4398270da64aa8f07 Mon Sep 17 00:00:00 2001 From: Josh Durgin Date: Fri, 1 Nov 2013 19:02:29 -0700 Subject: [PATCH] rbd: omit 'rw' option during map The ro and rw options were added in linux 3.7. To be compatible with older kernels, don't specify rw. The default will probably always be rw, so this should not present any problems in the future. Reported-by: nicolasc Signed-off-by: Josh Durgin --- src/rbd.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/rbd.cc b/src/rbd.cc index 147eb2c5138e..41cd24373552 100644 --- a/src/rbd.cc +++ b/src/rbd.cc @@ -1643,12 +1643,12 @@ static int do_kernel_add(const char *poolname, const char *imgname, } if (read_only) - oss << " ro"; + oss << " ro,"; else - oss << " rw"; + oss << " "; const char *user = g_conf->name.get_id().c_str(); - oss << ",name=" << user; + oss << "name=" << user; char key_name[strlen(user) + strlen("client.") + 1]; snprintf(key_name, sizeof(key_name), "client.%s", user); -- 2.47.3