From: David Zafman <dzafman@redhat.com>
Date: Wed, 4 Mar 2015 03:51:02 +0000 (-0800)
Subject: filestore: Change int open_journal() to void new_journal()
X-Git-Tag: v9.0.2~168^2~33
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=159f4ccf5c1962fc21b59e2fae6d5715c1a5aea0;p=ceph.git

filestore: Change int open_journal() to void new_journal()

Signed-off-by: David Zafman <dzafman@redhat.com>
---

diff --git a/src/os/FileStore.cc b/src/os/FileStore.cc
index 1e6ac23dbd69..26dadbe0f0b5 100644
--- a/src/os/FileStore.cc
+++ b/src/os/FileStore.cc
@@ -658,7 +658,7 @@ int FileStore::statfs(struct statfs *buf)
 }
 
 
-int FileStore::open_journal()
+void FileStore::new_journal()
 {
   if (journalpath.length()) {
     dout(10) << "open_journal at " << journalpath << dendl;
@@ -667,7 +667,7 @@ int FileStore::open_journal()
     if (journal)
       journal->logger = logger;
   }
-  return 0;
+  return;
 }
 
 int FileStore::dump_journal(ostream& out)
@@ -915,7 +915,7 @@ int FileStore::mkjournal()
 
   ret = 0;
 
-  open_journal();
+  new_journal();
   if (journal) {
     ret = journal->check();
     if (ret < 0) {
@@ -1497,7 +1497,7 @@ int FileStore::mount()
   }
 
   // journal
-  open_journal();
+  new_journal();
 
   // select journal mode?
   if (journal) {
diff --git a/src/os/FileStore.h b/src/os/FileStore.h
index bcd9953bb626..d45dc01a6a83 100644
--- a/src/os/FileStore.h
+++ b/src/os/FileStore.h
@@ -376,7 +376,7 @@ private:
   void _journaled_ahead(OpSequencer *osr, Op *o, Context *ondisk);
   friend struct C_JournaledAhead;
 
-  int open_journal();
+  void new_journal();
 
   PerfCounters *logger;