MDS: don't journal slave ops if we only have caps.

Previously we wanted to journal if we had caps on something. Now
that we're being strict about only journaling stuff we're auth for,
that's a bad choice to make.

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

diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index 507bdefa4f75c958d7d90f26931aeadfb0298db4..a1f82395613a2042db6c81835dfaecd15f39463b 100644 (file)
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -5559,8 +5559,7 @@ void Server::handle_slave_rename_prep(MDRequest *mdr)
 
   // journal it?
   if (srcdn->is_auth() ||
-      (destdnl->get_inode() && destdnl->get_inode()->is_auth()) ||
-      srcdnl->get_inode()->is_any_caps()) {
+      (destdnl->get_inode() && destdnl->get_inode()->is_auth())) {
     // journal.
     mdr->ls = mdlog->get_current_segment();
     ESlaveUpdate *le = new ESlaveUpdate(mdlog, "slave_rename_prep", mdr->reqid, mdr->slave_to_mds,