mds: rename: remove illicit assert.

We actually do want witnesses who aren't auth for anything
to do journaling in some cases, so kill the assert.
That also negates the need for the not_journaling check.

Signed-off-by: Greg Farnum <gregory.farnum@dreamhost.com>

diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index 332eb2cb242192d1cb7d9440b118f8cfda09a270..ea88cfaeb700672fbce4adeabf268a13134bf651 100644 (file)
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -5071,8 +5071,7 @@ version_t Server::_rename_prepare_import(MDRequest *mdr, CDentry *srcdn, bufferl
 
 void Server::_rename_prepare(MDRequest *mdr,
                             EMetaBlob *metablob, bufferlist *client_map_bl,
-                            CDentry *srcdn, CDentry *destdn, CDentry *straydn,
-                            bool not_journaling)
+                            CDentry *srcdn, CDentry *destdn, CDentry *straydn)
 {
   dout(10) << "_rename_prepare " << *mdr << " " << *srcdn << " " << *destdn << dendl;
   if (straydn)
@@ -5277,9 +5276,6 @@ void Server::_rename_prepare(MDRequest *mdr,
 
   // dest
   if (srcdnl->is_remote()) {
-    assert(not_journaling || srcdn->is_auth() ||destdn->is_auth() ||
-           (srci && srci->is_auth()) ||
-           (destdnl->get_inode() && destdnl->get_inode()->is_auth()));
     if (!linkmerge) {
       if (destdn->is_auth() && !destdnl->is_null())
        mdcache->journal_cow_dentry(mdr, metablob, destdn, CEPH_NOSNAP, 0, destdnl);

diff --git a/src/mds/Server.h b/src/mds/Server.h
index 8a7e3d38c9054d4929042720310b6c3102e0409d..a711aa6d562c8ed7e327ee88134357cd3e48c1cd 100644 (file)
--- a/src/mds/Server.h
+++ b/src/mds/Server.h
@@ -210,8 +210,7 @@ public:
   version_t _rename_prepare_import(MDRequest *mdr, CDentry *srcdn, bufferlist *client_map_bl);
   void _rename_prepare(MDRequest *mdr,
                       EMetaBlob *metablob, bufferlist *client_map_bl,
-                      CDentry *srcdn, CDentry *destdn, CDentry *straydn,
-                      bool not_journaling=false);
+                      CDentry *srcdn, CDentry *destdn, CDentry *straydn);
   /* set not_journaling=true if you're going to discard the results --
    * this bypasses the asserts to make sure we're journaling the right
    * things on the right nodes */