Revert "multi-mds/link: Handle rollback for referent_inodes list"

This reverts commit c39977ff26f03006aac03ddfb5e285dbe61bd7fe.

Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit 60f9ea0622f12c4037896a3f1730c0ea3eac9fb2)

diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index f45e86307fd2fbd097e7be2857034409f5225a05..01b82987ebb0d346b7dc47eb47ce56812540e2b1 100644 (file)
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -8142,7 +8142,6 @@ void Server::handle_peer_link_prep(const MDRequestRef& mdr)
   const auto& pf = targeti->get_parent_dn()->get_dir()->get_projected_fnode();
   rollback.old_dir_mtime = pf->fragstat.mtime;
   rollback.old_dir_rctime = pf->rstat.rctime;
-  rollback.referent_ino = referent_ino;
   rollback.was_inc = inc;
   if (realm_projected) {
     if (targeti->snaprealm) {
@@ -8302,16 +8301,10 @@ void Server::do_link_rollback(bufferlist &rbl, mds_rank_t leader, const MDReques
 
   // inode
   pi.inode->ctime = rollback.old_ctime;
-  if (rollback.was_inc) {
+  if (rollback.was_inc)
     pi.inode->nlink--;
-    if (rollback.referent_ino > 0) {
-      pi.inode->remove_referent_ino(rollback.referent_ino);
-      dout(10) << __func__ << " referent_inodes " << std::hex << pi.inode->get_referent_inodes()
-               << " referent ino removed " << rollback.referent_ino << dendl;
-    }
-  } else {
+  else
     pi.inode->nlink++;
-  }
 
   map<client_t,ref_t<MClientSnap>> splits;
   if (rollback.snapbl.length() && in->snaprealm) {

diff --git a/src/mds/events/EPeerUpdate.h b/src/mds/events/EPeerUpdate.h
index 087caa77996abee4022116c1770b54672bce4dee..88ddaa264a3ea174bb49d8d4db715b5b4e4afbff 100644 (file)
--- a/src/mds/events/EPeerUpdate.h
+++ b/src/mds/events/EPeerUpdate.h
@@ -33,7 +33,6 @@ struct link_rollback {
   utime_t old_dir_mtime;
   utime_t old_dir_rctime;
   bufferlist snapbl;
-  inodeno_t referent_ino;
 
   link_rollback() : ino(0), was_inc(false) {}
 

diff --git a/src/mds/journal.cc b/src/mds/journal.cc
index 1b172a125303484b3cd6d625602de7e18768d887..9d19efc420f85d2bbb11009a93314bc5323f270a 100644 (file)
--- a/src/mds/journal.cc
+++ b/src/mds/journal.cc
@@ -2579,7 +2579,7 @@ void ECommitted::generate_test_instances(std::list<ECommitted*>& ls)
 
 void link_rollback::encode(bufferlist &bl) const
 {
-  ENCODE_START(4, 2, bl);
+  ENCODE_START(3, 2, bl);
   encode(reqid, bl);
   encode(ino, bl);
   encode(was_inc, bl);
@@ -2587,13 +2587,12 @@ void link_rollback::encode(bufferlist &bl) const
   encode(old_dir_mtime, bl);
   encode(old_dir_rctime, bl);
   encode(snapbl, bl);
-  encode(referent_ino, bl);
   ENCODE_FINISH(bl);
 }
 
 void link_rollback::decode(bufferlist::const_iterator &bl)
 {
-  DECODE_START_LEGACY_COMPAT_LEN(4, 2, 2, bl);
+  DECODE_START_LEGACY_COMPAT_LEN(3, 2, 2, bl);
   decode(reqid, bl);
   decode(ino, bl);
   decode(was_inc, bl);
@@ -2602,8 +2601,6 @@ void link_rollback::decode(bufferlist::const_iterator &bl)
   decode(old_dir_rctime, bl);
   if (struct_v >= 3)
     decode(snapbl, bl);
-  if (struct_v >= 4)
-    decode(referent_ino, bl);
   DECODE_FINISH(bl);
 }
 
@@ -2615,7 +2612,6 @@ void link_rollback::dump(Formatter *f) const
   f->dump_stream("old_ctime") << old_ctime;
   f->dump_stream("old_dir_mtime") << old_dir_mtime;
   f->dump_stream("old_dir_rctime") << old_dir_rctime;
-  f->dump_stream("referent_ino") << referent_ino;
 }
 
 void link_rollback::generate_test_instances(std::list<link_rollback*>& ls)