client: fix relink, memory leak in dcache

diff --git a/src/client/Client.cc b/src/client/Client.cc
index 6f5c3033cc96a54bba7cefec75cd8f58dd058443..e8148b60d9da1453412d2e43f2c3a4947855e58c 100644 (file)
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -437,7 +437,7 @@ Inode* Client::insert_dentry_inode(Dir *dir, const string& dname, LeaseStat *dle
       dout(12) << " had dentry " << dname
                << " with WRONG ino " << dn->inode->inode.ino
                << dendl;
-      unlink(dn);
+      unlink(dn, true);
       dn = NULL;
     }
   }
@@ -452,7 +452,7 @@ Inode* Client::insert_dentry_inode(Dir *dir, const string& dname, LeaseStat *dle
         dout(12) << " had ino " << in->inode.ino
                  << " not linked or linked at the right position, relinking"
                  << dendl;
-        dn = relink(dir, dname, in);
+        dn = relink_inode(dir, dname, in);
       } else {
         // link
         dout(12) << " had ino " << in->inode.ino

diff --git a/src/client/Client.h b/src/client/Client.h
index 5e640a2bd05b4d128c495dda72077d7fcf6891f3..f5652def6b7ecd208b20fc1879e13ba133f36bf7 100644 (file)
--- a/src/client/Client.h
+++ b/src/client/Client.h
@@ -646,7 +646,7 @@ protected:
     return dn;
   }
 
-  void unlink(Dentry *dn) {
+  void unlink(Dentry *dn, bool keepdir = false) {
     Inode *in = dn->inode;
     assert(in->dn == dn);
 
@@ -658,7 +658,7 @@ protected:
         
     // unlink from dir
     dn->dir->dentries.erase(dn->name);
-    if (dn->dir->is_empty()) 
+    if (dn->dir->is_empty() && !keepdir) 
       close_dir(dn->dir);
     dn->dir = 0;
 
@@ -667,7 +667,7 @@ protected:
     delete dn;
   }
 
-  Dentry *relink(Dir *dir, const string& name, Inode *in) {
+  Dentry *relink_inode(Dir *dir, const string& name, Inode *in) {
     Dentry *olddn = in->dn;
     Dir *olddir = olddn->dir;  // note: might == dir!
 
@@ -688,6 +688,7 @@ protected:
     olddn->inode = 0;
     olddn->dir = 0;
     lru.lru_remove(olddn);
+    delete olddn;
     
     // link new dn to dir
     dir->dentries[name] = newdn;