From 46bb4122333d39eb46aa84a84013a46cd135e647 Mon Sep 17 00:00:00 2001 From: Josh Durgin Date: Fri, 21 Oct 2011 13:07:33 -0700 Subject: [PATCH] rbd: let all commands use the pool/image@snapshot format This way you aren't forced to use '-p' or '--snap' to specify a pool or snapshot for some commands. Signed-off-by: Josh Durgin --- src/rbd.cc | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/rbd.cc b/src/rbd.cc index fdab9b5737eca..63d4380c10b30 100644 --- a/src/rbd.cc +++ b/src/rbd.cc @@ -1003,13 +1003,10 @@ int main(int argc, const char **argv) usage_exit(); } - if (opt_cmd == OPT_INFO || opt_cmd == OPT_EXPORT || opt_cmd == OPT_COPY || - opt_cmd == OPT_SNAP_CREATE || opt_cmd == OPT_SNAP_ROLLBACK || - opt_cmd == OPT_SNAP_REMOVE || - opt_cmd == OPT_MAP || opt_cmd == OPT_UNMAP) { - set_pool_image_name(poolname, imgname, (char **)&poolname, - (char **)&imgname, (char **)&snapname); - } + // do this unconditionally so we can parse pool/image@snapshot into + // the relevant parts + set_pool_image_name(poolname, imgname, (char **)&poolname, + (char **)&imgname, (char **)&snapname); if (snapname && opt_cmd != OPT_SNAP_CREATE && opt_cmd != OPT_SNAP_ROLLBACK && opt_cmd != OPT_SNAP_REMOVE && opt_cmd != OPT_INFO && opt_cmd != OPT_EXPORT && opt_cmd != OPT_COPY) { -- 2.39.5