From: Colin Patrick McCabe <cmccabe@alumni.cmu.edu>
Date: Fri, 6 May 2011 21:28:02 +0000 (-0700)
Subject: rados_sync: do_export: fix diff'ing
X-Git-Tag: v0.28~57^2~12
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=73facc19c6aa572d883075454ff851521f2f7fc5;p=ceph.git

rados_sync: do_export: fix diff'ing

Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>
---

diff --git a/src/rados_sync.cc b/src/rados_sync.cc
index 5a3c6efb4865..dfe31eb51df2 100644
--- a/src/rados_sync.cc
+++ b/src/rados_sync.cc
@@ -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) {