]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mds: check myin, not stray, in rejoin_send_acks
authorSage Weil <sage@newdream.net>
Tue, 23 Mar 2010 18:46:49 +0000 (11:46 -0700)
committerSage Weil <sage@newdream.net>
Wed, 24 Mar 2010 23:02:37 +0000 (16:02 -0700)
src/mds/MDCache.cc

index b3cd9152a42f6f3a66a404b0f5cd410609203ede..f6f4ba39f777d444dcd5082cd78200a2e51305ee 100644 (file)
@@ -4317,12 +4317,12 @@ void MDCache::rejoin_send_acks()
       ack[r->first]->add_inode_base(root);
       ack[r->first]->add_inode_locks(root, r->second);
     }
-  if (stray)
-    for (map<int,int>::iterator r = stray->replicas_begin();
-        r != stray->replicas_end();
+  if (myin)
+    for (map<int,int>::iterator r = myin->replicas_begin();
+        r != myin->replicas_end();
         ++r) {
-      ack[r->first]->add_inode_base(stray);
-      ack[r->first]->add_inode_locks(stray, r->second);
+      ack[r->first]->add_inode_base(myin);
+      ack[r->first]->add_inode_locks(myin, r->second);
     }
 
   // include inode base for any inodes whose scatterlocks may have updated