mds: get_linkage() should return projected if xlocked by self

Also, move set_xlocks_done() to _below_ set_trace_dist, in case some
other request comes in and xlocks the dentry.

Allow read_projected in XLOCK state too.  Note that other requests
_still_ won't be able to re-xlock or rdlock until the prior request
set xlock done.

1 files changed, 5 insertions, 4 deletions

diff --git a/src/mds/CDentry.h b/src/mds/CDentry.h
index b3db9b93dea..67c2b5753c0 100644
--- a/src/mds/CDentry.h
+++ b/src/mds/CDentry.h
@@ -207,11 +207,12 @@ public:
     return get_projected_linkage()->inode;
   }
 
-  bool use_projected(int client) {
-    return lock.can_read_projected(client);
+  bool use_projected(int client, Mutation *mut) {
+    return lock.can_read_projected(client) || 
+      lock.get_xlocked_by() == mut;
   }
-  linkage_t *get_linkage(int client) {
-    return use_projected(client) ? get_projected_linkage() : get_linkage();
+  linkage_t *get_linkage(int client, Mutation *mut) {
+    return use_projected(client, mut) ? get_projected_linkage() : get_linkage();
   }
 
   // ref counts: pin ourselves in the LRU when we're pinned.