From 435a5c14354e861d8c8a5da54779c3806be1d6c5 Mon Sep 17 00:00:00 2001 From: Tommi Virtanen Date: Fri, 5 Oct 2012 09:08:56 -0700 Subject: [PATCH] osd: Make --get-journal-fsid not attempt aio or direct_io. Signed-off-by: Tommi Virtanen --- src/osd/OSD.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index 77833f6ea38d9..3b1f2abe5f3fd 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -674,7 +674,10 @@ int OSD::peek_meta(const std::string &dev, std::string& magic, int OSD::peek_journal_fsid(string path, uuid_d& fsid) { - FileJournal j(fsid, 0, 0, path.c_str()); + // make sure we don't try to use aio or direct_io (and get annoying + // error messages from failing to do so); performance implications + // should be irrelevant for this use + FileJournal j(fsid, 0, 0, path.c_str(), false, false); return j.peek_fsid(fsid); } -- 2.39.5