mds: fix snap lookups in CInode encoding

diff --git a/src/mds/CInode.cc b/src/mds/CInode.cc
index cc46ba540540aa722bb78dc4637afb4005e8213e..6726d249268c725ec740cf49a2610e7479085cc1 100644 (file)
--- a/src/mds/CInode.cc
+++ b/src/mds/CInode.cc
@@ -1610,6 +1610,11 @@ int CInode::encode_inodestat(bufferlist& bl, Session *session,
 
     map<snapid_t,old_inode_t>::iterator p = old_inodes.lower_bound(snapid);
     if (p != old_inodes.end()) {
+      if (p->second.first > snapid) {
+        if  (p != old_inodes.begin())
+          --p;
+        else dout(0) << "old_inode.begin() starts after snapid!" << dendl;
+      }
       dout(15) << "encode_inodestat snapid " << snapid
               << " to old_inode [" << p->second.first << "," << p->first << "]" 
               << " " << p->second.inode.rstat