SERVER-46067 Replicate Before Journaling interface changes

flushAllFiles takes callerHoldsReadLock in order to skip taking a write lock to update the truncate point.
waitUntilDurable takes skipJournalListenerUpdate to know to skip updating the truncate point.
getToken takes a defer_lock and opCtx so collection locks can be locked prior to locking the mutex.
Remove inactive 'async' field from fsync command.
Put explicit dummy value for inactive (since MMAP) 'numFiles' result field in fsync command.
Put explicit dummy value for inactive (since MMAP) 'fsyncFiles' result field in write concern.

1 files changed, 4 insertions, 3 deletions

diff --git a/src/mongo/db/write_concern.h b/src/mongo/db/write_concern.h
index 1c9516a7c6d..5e2ab1af65f 100644
--- a/src/mongo/db/write_concern.h
+++ b/src/mongo/db/write_concern.h
@@ -76,13 +76,14 @@ struct WriteConcernResult {
     void appendTo(const WriteConcernOptions& writeConcern, BSONObjBuilder* result) const;
 
     int syncMillis;
-    int fsyncFiles;
-
     bool wTimedOut;
     int wTime;
     std::vector<HostAndPort> writtenTo;
-
     std::string err;  // this is the old err field, should deprecate
+
+    // This field has had a dummy value since MMAP went away. It is undocumented.
+    // Maintaining it so as not to cause unnecessary user pain across upgrades.
+    int fsyncFiles;
 };
 
 /**