From: Sage Weil <sage@newdream.net>
Date: Fri, 26 Jun 2009 22:25:28 +0000 (-0700)
Subject: uclient: fix bad merge
X-Git-Tag: v0.10~112
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=95b97b1996e6fed5edffad0c9c05a48712674ae7;p=ceph.git

uclient: fix bad merge
---

diff --git a/src/client/Client.cc b/src/client/Client.cc
index 6e72c5948d6e..a1269c2de6b4 100644
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -1165,7 +1165,9 @@ void Client::send_reconnect(int mds)
 	dout(10) << "    path " << path << dendl;
 
 	in->caps[mds]->seq = 0;  // reset seq.
-	m->add_cap(p->first.ino, path.get_ino(), path.get_path(),   // ino
+	m->add_cap(p->first.ino, 
+		   in->caps[mds]->cap_id,
+		   path.get_ino(), path.get_path(),   // ino
 		   in->caps_wanted(), // wanted
 		   in->caps[mds]->issued,     // issued
 		   in->inode.size, in->inode.mtime, in->inode.atime, in->snaprealm->ino);