From 5835a792fbbd1496513dbae696302081c94f7f7d Mon Sep 17 00:00:00 2001 From: Greg Farnum Date: Fri, 20 Aug 2010 11:47:03 -0700 Subject: [PATCH] mds: remove unnecessary silent fallout from add_primary_dentry. --- src/mds/Server.cc | 4 ---- src/mds/events/EMetaBlob.h | 6 ++---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/mds/Server.cc b/src/mds/Server.cc index ebdf6f9faf1..2975c82ae97 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 dc6af797d58..ca1435903e5 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 *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, -- 2.47.3