From: Greg Farnum <gregf@hq.newdream.net>
Date: Fri, 20 Aug 2010 18:47:03 +0000 (-0700)
Subject: mds: remove unnecessary silent fallout from add_primary_dentry.
X-Git-Tag: v0.22~229^2~10
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5835a792fbbd1496513dbae696302081c94f7f7d;p=ceph.git

mds: remove unnecessary silent fallout from add_primary_dentry.
---

diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index ebdf6f9faf15..2975c82ae975 100644
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -5653,10 +5653,6 @@ void Server::handle_client_mksnap(MDRequest *mdr)
     reply_request(mdr, -ENOTDIR);
     return;
   }
-/*  if (diri->is_system()) {  // no snaps on root dir, at least not until we can store it
-    reply_request(mdr, -EPERM);
-    return;
-  }*/
 
   const string &snapname = req->get_filepath().last_dentry();
   dout(10) << "mksnap " << snapname << " on " << *diri << dendl;
diff --git a/src/mds/events/EMetaBlob.h b/src/mds/events/EMetaBlob.h
index dc6af797d584..ca1435903e53 100644
--- a/src/mds/events/EMetaBlob.h
+++ b/src/mds/events/EMetaBlob.h
@@ -507,10 +507,8 @@ private:
   inode_t *add_primary_dentry(CDentry *dn, bool dirty, 
 			      CInode *in=0, fragtree_t *pdft=0, bufferlist *psnapbl=0,
 			      map<string,bufferptr> *px=0) {
-    if (dn)
-      return add_primary_dentry(add_dir(dn->get_dir(), false),
-			      dn, dirty, in, pdft, psnapbl, px);
-    else return NULL;
+    return add_primary_dentry(add_dir(dn->get_dir(), false),
+                              dn, dirty, in, pdft, psnapbl, px);
   }
   inode_t *add_primary_dentry(dirlump& lump, CDentry *dn, bool dirty, 
 			      CInode *in=0, fragtree_t *pdft=0, bufferlist *psnapbl=0,