From 9b6cf70b1488c96d07169c19bbe4042f2b542f5b Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 7 Jan 2010 14:33:25 -0800 Subject: [PATCH] osd: use journal in peek_super --- src/cosd.cc | 2 +- src/osd/OSD.cc | 4 ++-- src/osd/OSD.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/cosd.cc b/src/cosd.cc index e0687d78a23a1..cfba432e32b05 100644 --- a/src/cosd.cc +++ b/src/cosd.cc @@ -112,7 +112,7 @@ int main(int argc, const char **argv) nstring magic; ceph_fsid_t fsid; int w; - int r = OSD::peek_super(g_conf.osd_data, magic, fsid, w); + int r = OSD::peek_super(g_conf.osd_data, g_conf.osd_journal, magic, fsid, w); if (r < 0) { cerr << TEXT_RED << " ** " << TEXT_HAZARD << "ERROR: " << TEXT_RED << "unable to open OSD superblock on " << g_conf.osd_data << ": " << strerror_r(-r, buf, sizeof(buf)) << TEXT_NORMAL << std::endl; diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index 047494abbfe63..0784fcc6e3105 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -193,9 +193,9 @@ int OSD::mkfs(const char *dev, const char *jdev, ceph_fsid_t fsid, int whoami) return r; } -int OSD::peek_super(const char *dev, nstring& magic, ceph_fsid_t& fsid, int& whoami) +int OSD::peek_super(const char *dev, const char *journal, nstring& magic, ceph_fsid_t& fsid, int& whoami) { - ObjectStore *store = create_object_store(dev, NULL); + ObjectStore *store = create_object_store(dev, journal); if (!store) return -ENODEV; int err = store->mount(); diff --git a/src/osd/OSD.h b/src/osd/OSD.h index 8ed3fb39953ad..807174987da42 100644 --- a/src/osd/OSD.h +++ b/src/osd/OSD.h @@ -851,7 +851,7 @@ protected: static int find_osd_dev(char *result, int whoami); static ObjectStore *create_object_store(const char *dev, const char *jdev); static int mkfs(const char *dev, const char *jdev, ceph_fsid_t fsid, int whoami); - static int peek_super(const char *dev, nstring& magic, ceph_fsid_t& fsid, int& whoami); + static int peek_super(const char *dev, const char *journal, nstring& magic, ceph_fsid_t& fsid, int& whoami); // startup/shutdown int init(); -- 2.39.5