diff options
-rw-r--r-- | src/cls/rgw/cls_rgw.cc | 2 | ||||
-rw-r--r-- | src/librbd/object_map/Request.h | 1 | ||||
-rw-r--r-- | src/librbd/object_map/ResizeRequest.h | 1 | ||||
-rw-r--r-- | src/librbd/object_map/SnapshotCreateRequest.h | 1 | ||||
-rw-r--r-- | src/librbd/object_map/SnapshotRemoveRequest.h | 1 | ||||
-rw-r--r-- | src/librbd/object_map/SnapshotRollbackRequest.h | 1 | ||||
-rw-r--r-- | src/librbd/object_map/UpdateRequest.h | 1 | ||||
-rw-r--r-- | src/os/newstore/NewStore.h | 2 |
8 files changed, 9 insertions, 1 deletions
diff --git a/src/cls/rgw/cls_rgw.cc b/src/cls/rgw/cls_rgw.cc index b4892fde9d6..088e2c5965f 100644 --- a/src/cls/rgw/cls_rgw.cc +++ b/src/cls/rgw/cls_rgw.cc @@ -461,7 +461,7 @@ int rgw_bucket_list(cls_method_context_t hctx, bufferlist *in, bufferlist *out) decode_list_index_key(kiter->first, &key, &ver); start_key = kiter->first; - CLS_LOG(20, "start_key=%s len=%d", start_key.c_str(), start_key.size()); + CLS_LOG(20, "start_key=%s len=%lu", start_key.c_str(), start_key.size()); if (!entry.is_valid()) { CLS_LOG(20, "entry %s[%s] is not valid\n", key.name.c_str(), key.instance.c_str()); diff --git a/src/librbd/object_map/Request.h b/src/librbd/object_map/Request.h index fdc22de0824..84ed605d357 100644 --- a/src/librbd/object_map/Request.h +++ b/src/librbd/object_map/Request.h @@ -34,6 +34,7 @@ protected: return 0; } virtual void finish() = 0; + using AsyncRequest<>::finish; private: /** diff --git a/src/librbd/object_map/ResizeRequest.h b/src/librbd/object_map/ResizeRequest.h index ca9539344c4..c19241c6521 100644 --- a/src/librbd/object_map/ResizeRequest.h +++ b/src/librbd/object_map/ResizeRequest.h @@ -34,6 +34,7 @@ public: protected: virtual void finish(); + using AsyncRequest<>::finish; private: ceph::BitVector<2> *m_object_map; diff --git a/src/librbd/object_map/SnapshotCreateRequest.h b/src/librbd/object_map/SnapshotCreateRequest.h index f8143325d54..e2a25d01384 100644 --- a/src/librbd/object_map/SnapshotCreateRequest.h +++ b/src/librbd/object_map/SnapshotCreateRequest.h @@ -57,6 +57,7 @@ protected: virtual void finish() { } + using AsyncRequest<>::finish; private: State m_state; diff --git a/src/librbd/object_map/SnapshotRemoveRequest.h b/src/librbd/object_map/SnapshotRemoveRequest.h index 75fbdc8839f..3f2a2412a1d 100644 --- a/src/librbd/object_map/SnapshotRemoveRequest.h +++ b/src/librbd/object_map/SnapshotRemoveRequest.h @@ -66,6 +66,7 @@ protected: virtual void finish() { } + using AsyncRequest<>::finish; private: State m_state; diff --git a/src/librbd/object_map/SnapshotRollbackRequest.h b/src/librbd/object_map/SnapshotRollbackRequest.h index 47171665382..f697d49e215 100644 --- a/src/librbd/object_map/SnapshotRollbackRequest.h +++ b/src/librbd/object_map/SnapshotRollbackRequest.h @@ -57,6 +57,7 @@ protected: virtual void finish() { } + using AsyncRequest<>::finish; private: State m_state; diff --git a/src/librbd/object_map/UpdateRequest.h b/src/librbd/object_map/UpdateRequest.h index 6c277b01a63..03a0909662c 100644 --- a/src/librbd/object_map/UpdateRequest.h +++ b/src/librbd/object_map/UpdateRequest.h @@ -34,6 +34,7 @@ public: protected: virtual void finish(); + using AsyncRequest<>::finish; private: ceph::BitVector<2> &m_object_map; diff --git a/src/os/newstore/NewStore.h b/src/os/newstore/NewStore.h index c32e2a9d45e..370c9b50e10 100644 --- a/src/os/newstore/NewStore.h +++ b/src/os/newstore/NewStore.h @@ -351,6 +351,7 @@ public: void _process(fsync_item *i, ThreadPool::TPHandle &handle) { store->_txc_process_fsync(i); } + using ThreadPool::WorkQueue<fsync_item>::_process; void _clear() { fd_queue.clear(); } @@ -422,6 +423,7 @@ public: store->_wal_apply(i); i->osr->wal_apply_lock.Unlock(); } + using ThreadPool::WorkQueue<TransContext>::_process; void _clear() { assert(wal_queue.empty()); } |