client: unlink dentry on traceless rmdir, unlink reply

This used to be handled in _unlink() and _rmdir() even when a trace was
present in the reply, but this is cleaner.

Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/src/client/Client.cc b/src/client/Client.cc
index 535752ad33d7de9ddd70eafb87f04e0e6154c32f..38b5d053084b98aaca35eeeb1ba3dcc370e1670b 100644 (file)
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -1006,14 +1006,17 @@ Inode* Client::insert_trace(MetaRequest *request, MetaSession *session)
     }
 
     if (d && reply->get_result() == 0) {
-      Dentry *od = request->old_dentry();
-      if (od) {
+      if (request->head.op == CEPH_MDS_OP_RENAME) {
        // rename
+       Dentry *od = request->old_dentry();
+       ldout(cct, 10) << " unlinking rename src dn " << od << " for traceless reply" << dendl;
+       assert(od);
        unlink(od, false, false);
       } else if (request->head.op == CEPH_MDS_OP_RMDIR ||
                 request->head.op == CEPH_MDS_OP_UNLINK) {
        // unlink, rmdir
-       // ...
+       ldout(cct, 10) << " unlinking unlink/rmdir dn " << d << " for traceless reply" << dendl;
+       unlink(d, true, true);
       }
     }
     return NULL;