From: xie xingguo <xie.xingguo@zte.com.cn>
Date: Tue, 31 May 2016 02:22:18 +0000 (+0800)
Subject: mon/PGMonitor: move fsid check ahead
X-Git-Tag: ses5-milestone5~520^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b3b491104db347207961306c9ee7e9fde2aa1267;p=ceph.git

mon/PGMonitor: move fsid check ahead

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
---

diff --git a/src/mon/PGMonitor.cc b/src/mon/PGMonitor.cc
index 68f8a71e3223..3b88258bd400 100644
--- a/src/mon/PGMonitor.cc
+++ b/src/mon/PGMonitor.cc
@@ -621,17 +621,20 @@ void PGMonitor::handle_statfs(MonOpRequestRef op)
             << session->caps << dendl;
     return;
   }
-  MStatfsReply *reply;
-
-  dout(10) << "handle_statfs " << *statfs << " from " << statfs->get_orig_source() << dendl;
 
   if (statfs->fsid != mon->monmap->fsid) {
-    dout(0) << "handle_statfs on fsid " << statfs->fsid << " != " << mon->monmap->fsid << dendl;
+    dout(0) << "handle_statfs on fsid " << statfs->fsid
+            << " != " << mon->monmap->fsid << dendl;
     return;
   }
 
+
+  dout(10) << "handle_statfs " << *statfs
+           << " from " << statfs->get_orig_source() << dendl;
+
   // fill out stfs
-  reply = new MStatfsReply(mon->monmap->fsid, statfs->get_tid(), get_last_committed());
+  MStatfsReply *reply = new MStatfsReply(mon->monmap->fsid, statfs->get_tid(),
+    get_last_committed());
 
   // these are in KB.
   reply->h.st.kb = pg_map.osd_sum.kb;