From 5f218c22da33546451cb1d26a5785cd85f654f7b Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 28 Jan 2008 11:04:46 -0800 Subject: [PATCH] minor fixups --- src/mds/Server.cc | 1 + src/mon/MDSMonitor.cc | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/mds/Server.cc b/src/mds/Server.cc index 053e6549e7ada..a2bbe31153e6f 100644 --- a/src/mds/Server.cc +++ b/src/mds/Server.cc @@ -394,6 +394,7 @@ void Server::handle_client_reconnect(MClientReconnect *m) // mark client caps stale. inode_t fake_inode; + memset(&fake_inode, 0, sizeof(fake_inode)); fake_inode.ino = p->first; MClientFileCaps *stale = new MClientFileCaps(CEPH_CAP_OP_EXPORT, fake_inode, diff --git a/src/mon/MDSMonitor.cc b/src/mon/MDSMonitor.cc index 8fa1647e47236..37d306f7f4230 100644 --- a/src/mon/MDSMonitor.cc +++ b/src/mon/MDSMonitor.cc @@ -569,8 +569,8 @@ void MDSMonitor::tick() int mds = pending_mdsmap.get_addr_rank(addr); if (mds >= 0) { // failure! - int newstate; int curstate = pending_mdsmap.get_state(mds); + int newstate = curstate; switch (curstate) { case MDSMap::STATE_CREATING: newstate = MDSMap::STATE_DNE; // didn't finish creating -- 2.39.5