mds: zero inode layout for dirs

These aren't used for anything.

Also rename the default_dir_layout to _log_, since that's all that we now
use it for.

Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index 59891df720e692acd5ef74a1f732f1a9e0a7602e..fe6d3ee32ec3e2881eac156ef5d19f351528ba13 100644 (file)
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -239,9 +239,9 @@ void MDCache::init_layouts()
   default_file_layout.fl_pg_preferred = -1;
   default_file_layout.fl_pg_pool = mds->mdsmap->get_data_pg_pool();
 
-  default_dir_layout = g_default_file_layout;
-  default_dir_layout.fl_pg_preferred = -1;
-  default_dir_layout.fl_pg_pool = mds->mdsmap->get_metadata_pg_pool();
+  default_log_layout = g_default_file_layout;
+  default_log_layout.fl_pg_preferred = -1;
+  default_log_layout.fl_pg_pool = mds->mdsmap->get_metadata_pg_pool();
 }
 
 CInode *MDCache::create_system_inode(inodeno_t ino, int mode)
@@ -256,7 +256,7 @@ CInode *MDCache::create_system_inode(inodeno_t ino, int mode)
     in->inode.mtime = g_clock.now();
   in->inode.nlink = 1;
   if (in->inode.is_dir())
-    in->inode.layout = default_dir_layout;
+    memset(&in->inode.layout, 0, sizeof(in->inode.layout));
   else
     in->inode.layout = default_file_layout;
 

diff --git a/src/mds/MDCache.h b/src/mds/MDCache.h
index 086caa3df34318cc6390b6520bba7fcf3865e99a..34c96c2cefa953886797bc8fce153d6ba12f25e6 100644 (file)
--- a/src/mds/MDCache.h
+++ b/src/mds/MDCache.h
@@ -455,7 +455,7 @@ public:
   int num_caps;
 
   ceph_file_layout default_file_layout;
-  ceph_file_layout default_dir_layout;
+  ceph_file_layout default_log_layout;
 
   // -- client leases --
 public:

diff --git a/src/mds/MDLog.cc b/src/mds/MDLog.cc
index 765c7519138f216f5a92df028a79dc2b01230eb0..049f55a3b9fc75d66f2d4d6281c53564d37724cc 100644 (file)
--- a/src/mds/MDLog.cc
+++ b/src/mds/MDLog.cc
@@ -122,7 +122,7 @@ void MDLog::create(Context *c)
 {
   dout(5) << "create empty log" << dendl;
   init_journaler();
-  journaler->create(&mds->mdcache->default_dir_layout);
+  journaler->create(&mds->mdcache->default_log_layout);
   write_head(c);
 
   logger->set(l_mdl_expos, journaler->get_expire_pos());

diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index 0fbb128cf8496c3bb21d321105f3a50ba5666fe1..102ec7cc0b17e1820cd8ff82934bae2ecd574212 100644 (file)
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -1655,7 +1655,7 @@ CInode* Server::prepare_new_inode(MDRequest *mdr, CDir *dir, inodeno_t useino, u
   if (layout)
     in->inode.layout = *layout;
   else if (in->inode.is_dir())
-    in->inode.layout = mds->mdcache->default_dir_layout;
+    memset(&in->inode.layout, 0, sizeof(in->inode.layout));
   else
     in->inode.layout = mds->mdcache->default_file_layout;