mds: set/test ALL_LOCKED on fragment_dir request

This is an optimization to obviate repeated calls to acquire_locks.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit fca346d29fca4470290f8419214c4908e6a242b1)

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index 0226ce32f719a70ebeb56c9a86f29c2b2a4dc0ac..3ca1ca47e9bd42a2e4145192f3d13d4911bebf42 100644 (file)
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -12085,15 +12085,20 @@ void MDCache::dispatch_fragment_dir(const MDRequestRef& mdr)
   if (mdr->more()->peer_error)
     mdr->aborted = true;
 
-  if (!mdr->aborted) {
-    MutationImpl::LockOpVec lov;
-    lov.add_wrlock(&diri->dirfragtreelock);
-    // prevent a racing gather on any other scatterlocks too
-    lov.lock_scatter_gather(&diri->nestlock);
-    lov.lock_scatter_gather(&diri->filelock);
-    if (!mds->locker->acquire_locks(mdr, lov, NULL, {}, true)) {
-      if (!mdr->aborted)
-       return;
+  if (!(mdr->locking_state & MutationImpl::ALL_LOCKED)) {
+    if (!mdr->aborted) {
+      MutationImpl::LockOpVec lov;
+      lov.add_wrlock(&diri->dirfragtreelock);
+      // prevent a racing gather on any other scatterlocks too
+      lov.lock_scatter_gather(&diri->nestlock);
+      lov.lock_scatter_gather(&diri->filelock);
+      if (mds->locker->acquire_locks(mdr, lov, NULL, {}, true)) {
+        mdr->locking_state |= MutationImpl::ALL_LOCKED;
+      } else {
+        if (!mdr->aborted) {
+         return;
+        }
+      }
     }
   }