import 14.2.4 nautilus point release

[ceph.git] / ceph / src / rocksdb / utilities / transactions / optimistic_transaction.cc

diff --git a/ceph/src/rocksdb/utilities/transactions/optimistic_transaction.cc b/ceph/src/rocksdb/utilities/transactions/optimistic_transaction.cc
index 89d3226d5df449d16fd7fc87be0a44711e1addfc..48c9180ae9ee043fd190f7357cf8baef9e366a2d 100644 (file)
--- a/ceph/src/rocksdb/utilities/transactions/optimistic_transaction.cc
+++ b/ceph/src/rocksdb/utilities/transactions/optimistic_transaction.cc
@@ -80,8 +80,11 @@ Status OptimisticTransaction::Rollback() {
 // 'exclusive' is unused for OptimisticTransaction.
 Status OptimisticTransaction::TryLock(ColumnFamilyHandle* column_family,
                                       const Slice& key, bool read_only,
-                                      bool exclusive, bool untracked) {
-  if (untracked) {
+                                      bool exclusive, const bool do_validate,
+                                      const bool assume_tracked) {
+  assert(!assume_tracked);  // not supported
+  (void)assume_tracked;
+  if (!do_validate) {
     return Status::OK();
   }
   uint32_t cfh_id = GetColumnFamilyID(column_family);