From 82d4896bab7940ee4cce34eac264a860b74bdd1b Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Sun, 28 Jan 2018 12:15:18 +0100 Subject: [PATCH] tools: rados: drop --force option The global -f / --force option was introduced by 3425a8e5031a4f0c9c0eb85e8a329b02d05b9420 for use in import/export. After being rewritten by 3425a8e5031a4f0c9c0eb85e8a329b02d05b9420, the import/export no longer uses --force. I examined the rados tool source code and the test_rados_tool.sh script, with the conclusion that the rados tool does not use the --force option at all. So it's dead code ripe for pruning. Signed-off-by: Nathan Cutler --- src/tools/rados/rados.cc | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/tools/rados/rados.cc b/src/tools/rados/rados.cc index 2b6843e5aeacd..cc1bfd0b5e153 100644 --- a/src/tools/rados/rados.cc +++ b/src/tools/rados/rados.cc @@ -3733,8 +3733,6 @@ int main(int argc, const char **argv) } else if (ceph_argparse_flag(args, i, "-h", "--help", (char*)NULL)) { usage(cout); exit(0); - } else if (ceph_argparse_flag(args, i, "-f", "--force", (char*)NULL)) { - opts["force"] = "true"; } else if (ceph_argparse_flag(args, i, "--force-full", (char*)NULL)) { opts["force-full"] = "true"; } else if (ceph_argparse_flag(args, i, "-d", "--delete-after", (char*)NULL)) { -- 2.39.5