From: dongdong tao <tdd21151186@gmail.com>
Date: Tue, 9 Jan 2018 08:31:07 +0000 (+0800)
Subject: cephfs-journal-tool: add "set pool_id" option
X-Git-Tag: v12.2.3~161^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4d07eb8ba724c5bfcc7f8f12e6213282f497fb58;p=ceph.git

cephfs-journal-tool: add "set pool_id" option

Fixes: http://tracker.ceph.com/issues/22631

Signed-off-by: dongdong tao <tdd21151186@gmail.com>
(cherry picked from commit b3a5e313117028b23133f3e0d72e0b6b7159a178)
---

diff --git a/src/tools/cephfs/JournalTool.cc b/src/tools/cephfs/JournalTool.cc
index 20c83acecf3d..d49bedd8ecb2 100644
--- a/src/tools/cephfs/JournalTool.cc
+++ b/src/tools/cephfs/JournalTool.cc
@@ -277,6 +277,8 @@ int JournalTool::main_header(std::vector<const char*> &argv)
       field = &(js.header->expire_pos);
     } else if (field_name == "write_pos") {
       field = &(js.header->write_pos);
+    } else if (field_name == "pool_id") {
+      field = (uint64_t*)(&(js.header->layout.pool_id));
     } else {
       derr << "Invalid field '" << field_name << "'" << dendl;
       return -EINVAL;