unlink

git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@1318 29311d96-e01e-0410-9327-a35deaab8ce9

diff --git a/branches/sage/cephmds2/client/SyntheticClient.cc b/branches/sage/cephmds2/client/SyntheticClient.cc
index de08944b8d733d43f9d020e1d8980099d66f8e43..9821b63ff9f6466c483a7671c8cec366535d4820 100644 (file)
--- a/branches/sage/cephmds2/client/SyntheticClient.cc
+++ b/branches/sage/cephmds2/client/SyntheticClient.cc
@@ -1354,7 +1354,6 @@ void SyntheticClient::foo()
   client->rename("p2.l","p2");
   client->rename("p4","p4.l");
 
-  /*
   // check anchor updates
   client->mknod("dir1/a", 0644);
   client->link("dir1/a", "da1");
@@ -1373,7 +1372,6 @@ void SyntheticClient::foo()
   client->mknod("dir5/asdf", 0644);
   client->rename("dir3","dir4"); // ok
   client->rename("dir4","dir5"); // fail
-  */
 }
 
 int SyntheticClient::thrash_links(const char *basedir, int dirs, int files, int depth, int n)

diff --git a/branches/sage/cephmds2/mds/Server.cc b/branches/sage/cephmds2/mds/Server.cc
index 7403fcff04e362fbc9aad2d83741ccf4453d8c32..b8f7e8d8e3747ec981110e7738d3e6220e8acffa 100644 (file)
--- a/branches/sage/cephmds2/mds/Server.cc
+++ b/branches/sage/cephmds2/mds/Server.cc
@@ -382,14 +382,12 @@ void Server::dispatch_request(MDRequest *mdr)
     handle_client_link(mdr);
     break;
   case MDS_OP_UNLINK:
+  case MDS_OP_RMDIR:
     handle_client_unlink(mdr);
     break;
   case MDS_OP_RENAME:
     handle_client_rename(mdr);
     break;
-  case MDS_OP_RMDIR:
-    handle_client_unlink(mdr);
-    break;
   case MDS_OP_MKDIR:
     handle_client_mkdir(mdr);
     break;
@@ -1563,6 +1561,7 @@ void Server::handle_client_unlink(MDRequest *mdr)
   // dn looks ok.
 
   // get/open inode.
+  mdr->trace.swap(trace);
   CInode *in = request_pin_ref(mdr);
   if (!in) return;
   dout(7) << "dn links to " << *in << endl;
@@ -1700,7 +1699,6 @@ void Server::_unlink_local_finish(MDRequest *mdr,
 {
   dout(10) << "_unlink_local " << *dn << endl;
 
-  /*
   // unlink main dentry
   CInode *in = dn->inode;
   dn->dir->unlink_inode(dn);
@@ -1728,10 +1726,6 @@ void Server::_unlink_local_finish(MDRequest *mdr,
     mds->send_message_mds(unlink, it->first, MDS_PORT_CACHE);
   }
 
-  // unlock
-  mds->locker->dentry_xlock_finish(dn);
-  mds->locker->inode_hard_xlock_finish(in);
-  
   // bump target popularity
   mds->balancer->hit_dir(dn->dir, META_POP_DWR);
 
@@ -1741,7 +1735,6 @@ void Server::_unlink_local_finish(MDRequest *mdr,
 
   if (straydn)
     mdcache->eval_stray(straydn);
-  */
 }