summaryrefslogtreecommitdiff
path: root/src/ceph_osd.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/ceph_osd.cc')
-rw-r--r--src/ceph_osd.cc15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/ceph_osd.cc b/src/ceph_osd.cc
index afb3d02e53c..a823befed55 100644
--- a/src/ceph_osd.cc
+++ b/src/ceph_osd.cc
@@ -265,6 +265,14 @@ int main(int argc, const char **argv)
exit(0);
}
+ if (get_journal_fsid) {
+ uuid_d fsid;
+ int r = OSD::peek_journal_fsid(g_conf->osd_journal, fsid);
+ if (r == 0)
+ cout << fsid << std::endl;
+ exit(r);
+ }
+
string magic;
uuid_d cluster_fsid, osd_fsid;
int w;
@@ -297,13 +305,6 @@ int main(int argc, const char **argv)
cout << osd_fsid << std::endl;
exit(0);
}
- if (get_journal_fsid) {
- uuid_d fsid;
- int r = OSD::peek_journal_fsid(g_conf->osd_journal, fsid);
- if (r == 0)
- cout << fsid << std::endl;
- exit(r);
- }
pick_addresses(g_ceph_context);