]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
filestore: fix wipe_subvol the rest of the way
authorSage Weil <sage.weil@dreamhost.com>
Thu, 3 Feb 2011 23:24:06 +0000 (15:24 -0800)
committerSage Weil <sage.weil@dreamhost.com>
Thu, 3 Feb 2011 23:24:06 +0000 (15:24 -0800)
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
src/os/FileStore.cc

index e8e8adb75e577f0f20dc6d1cd19f804d11131675..1f20f22ac452db74dc3865a8b5a625148c1ffc0c 100644 (file)
@@ -599,7 +599,7 @@ int FileStore::wipe_subvol(const char *s)
        strcmp(de->d_name, "..") == 0)
       continue;
     ostringstream oss;
-    oss << basedir << "/" << de->d_name;
+    oss << old_dir.str().c_str() << "/" << de->d_name;
     int ret = run_cmd("rm", "-rf", oss.str().c_str(), NULL);
     if (ret) {
       derr << "FileStore::wipe_subvol: failed to remove " << oss.str() << ": "