Merge pull request #11419: jewel: Failure in snaptest-git-ceph.sh

Reviewed-by: Loic Dachary <ldachary@redhat.com>
ceph · Oct 13, 2016 · acd2ccd · acd2ccd
2 parents 25ded0d + 5173563
commit acd2ccd
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/client/Client.cc b/src/client/Client.cc
@@ -1554,7 +1554,7 @@ int Client::verify_reply_trace(int r,
     *pcreated = got_created_ino;
 
   if (request->target) {
-    ptarget->swap(request->target);
+    *ptarget = request->target;
     ldout(cct, 20) << "make_request target is " << *ptarget->get() << dendl;
   } else {
     if (got_created_ino && (p = inode_map.find(vinodeno_t(created_ino, CEPH_NOSNAP))) != inode_map.end()) {
@@ -2128,6 +2128,8 @@ void Client::send_request(MetaRequest *request, MetaSession *session,
   }
   if (request->got_unsafe) {
     r->set_replayed_op();
+    if (request->target)
+      r->head.ino = request->target->ino;
   } else {
     encode_cap_releases(request, mds);
     if (drop_cap_releases) // we haven't send cap reconnect yet, drop cap releases