]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
OSD / ShardData: Pass ctx to mutex constructors in sdata and sdata_ordering lock... 6455/head
authorJacek J. Łakis <jlakis@gklab-126-033.igk.intel.com>
Tue, 3 Nov 2015 12:00:16 +0000 (13:00 +0100)
committerJacek J. Łakis <jlakis@gklab-126-033.igk.intel.com>
Tue, 3 Nov 2015 12:00:16 +0000 (13:00 +0100)
Signed-off-by: Jacek J. Łakis <jacek.lakis@intel.com>
src/osd/OSD.h

index 996e7777af2faaff8667ddcee2dbf348e1aa1e27..404679df79f9e05d94879d45950691d4c00cb34c 100644 (file)
@@ -1601,9 +1601,9 @@ private:
       PrioritizedQueue< pair<PGRef, PGQueueable>, entity_inst_t> pqueue;
       ShardData(
        string lock_name, string ordering_lock,
-       uint64_t max_tok_per_prio, uint64_t min_cost)
-       : sdata_lock(lock_name.c_str()),
-         sdata_op_ordering_lock(ordering_lock.c_str()),
+       uint64_t max_tok_per_prio, uint64_t min_cost, CephContext *cct)
+       : sdata_lock(lock_name.c_str(), false, true, false, cct),
+         sdata_op_ordering_lock(ordering_lock.c_str(), false, true, false, cct),
          pqueue(max_tok_per_prio, min_cost) {}
     };
     
@@ -1625,7 +1625,7 @@ private:
        ShardData* one_shard = new ShardData(
          lock_name, order_lock,
          osd->cct->_conf->osd_op_pq_max_tokens_per_priority, 
-         osd->cct->_conf->osd_op_pq_min_cost);
+         osd->cct->_conf->osd_op_pq_min_cost, osd->cct);
        shard_list.push_back(one_shard);
       }
     }