From e1a371db6e9038845830b1b1957d6b933f4fecd7 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 7 Jan 2016 13:04:52 -0500 Subject: [PATCH] ceph-objectstore-tool: drop filestore-specific sanity check Just let mount() fail Signed-off-by: Sage Weil --- src/tools/ceph_objectstore_tool.cc | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/src/tools/ceph_objectstore_tool.cc b/src/tools/ceph_objectstore_tool.cc index f0829cdb39bc1..f487bbb55a7af 100644 --- a/src/tools/ceph_objectstore_tool.cc +++ b/src/tools/ceph_objectstore_tool.cc @@ -341,12 +341,6 @@ void myexit(int ret) exit(ret); } -static void invalid_filestore_path(string &path) -{ - cerr << "Invalid filestore path specified: " << path << "\n"; - myexit(1); -} - int get_log(ObjectStore *fs, __u8 struct_ver, coll_t coll, spg_t pgid, const pg_info_t &info, PGLog::IndexedLog &log, pg_missing_t &missing, @@ -2445,20 +2439,6 @@ int main(int argc, char **argv) perror(err.c_str()); myexit(1); } - //Verify data data-path really is a filestore - if (type == "filestore") { - if (!S_ISDIR(st.st_mode)) { - invalid_filestore_path(dpath); - } - check = dpath + "/current"; - if (::stat(check.c_str(), &st) == -1) { - perror("current"); - invalid_filestore_path(dpath); - } - if (!S_ISDIR(st.st_mode)) { - invalid_filestore_path(dpath); - } - } if (pgidstr.length() && !pgid.parse(pgidstr.c_str())) { cerr << "Invalid pgid '" << pgidstr << "' specified" << std::endl; -- 2.39.5