]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rados_sync: do_export: fix diff'ing
authorColin Patrick McCabe <cmccabe@alumni.cmu.edu>
Fri, 6 May 2011 21:28:02 +0000 (14:28 -0700)
committerColin Patrick McCabe <cmccabe@alumni.cmu.edu>
Fri, 6 May 2011 21:28:02 +0000 (14:28 -0700)
Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>
src/rados_sync.cc

index 5a3c6efb4865e5617bf4d386f8ad940f12d3cac1..dfe31eb51df2d584518ec35a27a6563e4c4580ef 100644 (file)
@@ -560,7 +560,8 @@ static int do_export(IoCtx& io_ctx, const char *dir_name)
       cerr << "do_export: error getting BackedUpObject from rados." << std::endl;
       return ret;
     }
-    ret = BackedUpObject::from_file(rados_name.c_str(), dir_name, &dobj);
+    std::string obj_path(sobj->get_fs_path(dir_name));
+    ret = BackedUpObject::from_file(obj_path.c_str(), dir_name, &dobj);
     if (ret == ENOENT) {
       sobj->get_xattrs(only_in_a);
       need_download = true;
@@ -577,7 +578,6 @@ static int do_export(IoCtx& io_ctx, const char *dir_name)
        need_download = true;
       }
     }
-    std::string obj_path(sobj->get_fs_path(dir_name));
     if (need_download) {
       ret = sobj->download(io_ctx, obj_path.c_str());
       if (ret) {