From 170499a1e570bc110be08ca2a38063229fee75dc Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 16 Oct 2017 17:42:29 -0500 Subject: [PATCH] os/bluestore: make _write_bdev_label static and public Signed-off-by: Sage Weil (cherry picked from commit 0b0550c967ae0d6ae49641c6859f0b63267e2cd9) --- src/os/bluestore/BlueStore.cc | 7 ++++--- src/os/bluestore/BlueStore.h | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc index d20f3aa8ecf42..f3d8d58679d76 100644 --- a/src/os/bluestore/BlueStore.cc +++ b/src/os/bluestore/BlueStore.cc @@ -3808,7 +3808,7 @@ int BlueStore::write_meta(const std::string& key, const std::string& value) return ObjectStore::write_meta(key, value); } label.meta[key] = value; - r = _write_bdev_label(p, label); + r = _write_bdev_label(cct, p, label); assert(r == 0); return ObjectStore::write_meta(key, value); } @@ -4021,7 +4021,8 @@ void BlueStore::_close_path() path_fd = -1; } -int BlueStore::_write_bdev_label(string path, bluestore_bdev_label_t label) +int BlueStore::_write_bdev_label(CephContext *cct, + string path, bluestore_bdev_label_t label) { dout(10) << __func__ << " path " << path << " label " << label << dendl; bufferlist bl; @@ -4102,7 +4103,7 @@ int BlueStore::_check_or_set_bdev_label( label.size = size; label.btime = ceph_clock_now(); label.description = desc; - int r = _write_bdev_label(path, label); + int r = _write_bdev_label(cct, path, label); if (r < 0) return r; } else { diff --git a/src/os/bluestore/BlueStore.h b/src/os/bluestore/BlueStore.h index 39f88b9f8b558..df42ffa8c44da 100644 --- a/src/os/bluestore/BlueStore.h +++ b/src/os/bluestore/BlueStore.h @@ -1982,8 +1982,9 @@ private: int _setup_block_symlink_or_file(string name, string path, uint64_t size, bool create); - int _write_bdev_label(string path, bluestore_bdev_label_t label); public: + static int _write_bdev_label(CephContext* cct, + string path, bluestore_bdev_label_t label); static int _read_bdev_label(CephContext* cct, string path, bluestore_bdev_label_t *label); private: -- 2.39.5