diff options
Diffstat (limited to 'src/mongo/db/storage/mmap_v1/data_file.h')
-rw-r--r-- | src/mongo/db/storage/mmap_v1/data_file.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/mongo/db/storage/mmap_v1/data_file.h b/src/mongo/db/storage/mmap_v1/data_file.h index 57b5fb223f9..60dc095791e 100644 --- a/src/mongo/db/storage/mmap_v1/data_file.h +++ b/src/mongo/db/storage/mmap_v1/data_file.h @@ -182,9 +182,9 @@ public: return version.majorRaw() == 0; } - void init(OperationContext* txn, int fileno, int filelength, const char* filename); + void init(OperationContext* opCtx, int fileno, int filelength, const char* filename); - void checkUpgrade(OperationContext* txn); + void checkUpgrade(OperationContext* opCtx); bool isEmpty() const { return uninitialized() || (unusedLength == fileLength - HeaderSize - 16); @@ -195,13 +195,13 @@ public: class DataFile { public: - DataFile(OperationContext* txn, int fn) : _fileNo(fn), mmf(txn), _mb(NULL) {} + DataFile(OperationContext* opCtx, int fn) : _fileNo(fn), mmf(opCtx), _mb(NULL) {} /** @return true if found and opened. if uninitialized (prealloc only) does not open. */ - Status openExisting(OperationContext* txn, const char* filename); + Status openExisting(OperationContext* opCtx, const char* filename); /** creates if DNE */ - void open(OperationContext* txn, + void open(OperationContext* opCtx, const char* filename, int requestedDataSize = 0, bool preallocateOnly = false); @@ -209,12 +209,12 @@ public: /** * Must be called before destruction. */ - void close(OperationContext* txn) { - LockMongoFilesExclusive lock(txn); - mmf.close(txn); + void close(OperationContext* opCtx) { + LockMongoFilesExclusive lock(opCtx); + mmf.close(opCtx); } - DiskLoc allocExtentArea(OperationContext* txn, int size); + DiskLoc allocExtentArea(OperationContext* opCtx, int size); DataFileHeader* getHeader() { return header(); |