From: John Spray <john.spray@redhat.com>
Date: Thu, 30 Apr 2015 15:28:23 +0000 (+0100)
Subject: mds: remove redundant 'journal' file open
X-Git-Tag: v9.0.2~217^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4730a4580e5fde89fc14e8dab32ffc76ef0516a9;p=ceph.git

mds: remove redundant 'journal' file open

Follow up to " mds: remove redundant journal inode", for
the case in open_root as opposed to create_mydir

Signed-off-by: John Spray <john.spray@redhat.com>
---

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index 041c691b3a3..52baafe9ddd 100644
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -671,15 +671,6 @@ void MDCache::populate_mydir()
     }
   }
 
-  // open or create journal file
-  string jname("journal");
-  CDentry *jdn = mydir->lookup(jname);
-  if (!jdn || !jdn->get_linkage()->get_inode()) {
-    _create_system_file(mydir, jname.c_str(), create_system_inode(MDS_INO_LOG_OFFSET + mds->whoami, S_IFREG),
-			new C_MDS_RetryOpenRoot(this));
-    return;
-  }
-
   // okay!
   dout(10) << "populate_mydir done" << dendl;
   assert(!open);