SERVER-13639: small changes to extent code

4 files changed, 6 insertions, 14 deletions

diff --git a/src/mongo/db/storage/extent.h b/src/mongo/db/storage/extent.h
index b88115a9b38..00ce898aa02 100644
--- a/src/mongo/db/storage/extent.h
+++ b/src/mongo/db/storage/extent.h
@@ -37,7 +37,6 @@
 #include "mongo/db/structure/catalog/namespace.h"
 
 namespace mongo {
-    class TransactionExperiment;
 
     /* extents are datafile regions where all the records within the region
        belong to the same namespace.
@@ -47,11 +46,13 @@ namespace mongo {
     */
 #pragma pack(1)
     struct Extent {
-    public:
         enum { extentSignature = 0x41424344 };
         unsigned magic;
         DiskLoc myLoc;
-        DiskLoc xnext, xprev; /* next/prev extent for this namespace */
+
+        /* next/prev extent for this namespace */
+        DiskLoc xnext;
+        DiskLoc xprev;
 
         /* which namespace this extent is for.  this is just for troubleshooting really
            and won't even be correct if the collection were renamed!
diff --git a/src/mongo/db/storage/extent_manager.h b/src/mongo/db/storage/extent_manager.h
index e5ea43c8a18..32547408622 100644
--- a/src/mongo/db/storage/extent_manager.h
+++ b/src/mongo/db/storage/extent_manager.h
@@ -33,8 +33,6 @@
 #include <string>
 #include <vector>
 
-#include <boost/filesystem/path.hpp>
-
 #include "mongo/base/status.h"
 #include "mongo/base/string_data.h"
 #include "mongo/db/diskloc.h"
@@ -58,8 +56,6 @@ namespace mongo {
      *  - this structure is NOT stored on disk
      *  - this class is NOT thread safe, locking should be above (for now)
      *
-     * implementation:
-     *  - ExtentManager holds a list of DataFile
      */
     class ExtentManager {
         MONGO_DISALLOW_COPYING( ExtentManager );
@@ -70,11 +66,6 @@ namespace mongo {
         virtual ~ExtentManager(){}
 
         /**
-         * deletes all state and puts back to original state
-         */
-        //void reset();
-
-        /**
          * opens all current files
          */
         virtual Status init(TransactionExperiment* txn) = 0;
diff --git a/src/mongo/db/storage/mmap_v1/mmap_v1_extent_manager.cpp b/src/mongo/db/storage/mmap_v1/mmap_v1_extent_manager.cpp
index 3cfa81e2adc..c3413924588 100644
--- a/src/mongo/db/storage/mmap_v1/mmap_v1_extent_manager.cpp
+++ b/src/mongo/db/storage/mmap_v1/mmap_v1_extent_manager.cpp
@@ -1,7 +1,7 @@
 // mmap_v1_extent_manager.cpp
 
 /**
-*    Copyright (C) 2013 10gen Inc.
+*    Copyright (C) 2014 MongoDB Inc.
 *
 *    This program is free software: you can redistribute it and/or  modify
 *    it under the terms of the GNU Affero General Public License, version 3,
diff --git a/src/mongo/db/storage/mmap_v1/mmap_v1_extent_manager.h b/src/mongo/db/storage/mmap_v1/mmap_v1_extent_manager.h
index 39d54f1e690..5edd7b8e135 100644
--- a/src/mongo/db/storage/mmap_v1/mmap_v1_extent_manager.h
+++ b/src/mongo/db/storage/mmap_v1/mmap_v1_extent_manager.h
@@ -1,7 +1,7 @@
 // mmap_v1_extent_manager.h
 
 /**
-*    Copyright (C) 2013 10gen Inc.
+*    Copyright (C) 2014 MongoDB Inc.
 *
 *    This program is free software: you can redistribute it and/or  modify
 *    it under the terms of the GNU Affero General Public License, version 3,