SERVER-15541 Simplify the save/restore lock state code

There is no need to keep around the recursion counts, because yielding
only happens at the top-most level.

1 files changed, 0 insertions, 8 deletions

diff --git a/src/mongo/db/concurrency/locker.h b/src/mongo/db/concurrency/locker.h
index a71efe6927a..c2acc48133f 100644
--- a/src/mongo/db/concurrency/locker.h
+++ b/src/mongo/db/concurrency/locker.h
@@ -159,20 +159,12 @@ namespace mongo {
             // The global lock is handled differently from all other locks.
             LockMode globalMode;
 
-            // One can acquire the global lock repeatedly.
-            unsigned globalRecursiveCount;
-
             struct OneLock {
                 // What lock resource is held?
                 ResourceId resourceId;
 
                 // In what mode is it held?
                 LockMode mode;
-
-                // What's the recursive count of this lock?  Note that we don't store any state
-                // about how we got this lock (eg upgrade), just how many times we've locked it
-                // in this mode.
-                unsigned recursiveCount;
             };
 
             // The non-global non-flush locks held, sorted by granularity.  That is, locks[i] is