filestore: fix --mkjournal option

Read fsid off disk before creating journal.

diff --git a/src/os/FileStore.cc b/src/os/FileStore.cc
index 56f2d472892e2db6aa15a6dc0e6e5425e3ce90f8..7bca2b8c159aeceddbb977c4b20d4353ae42f82a 100644 (file)
--- a/src/os/FileStore.cc
+++ b/src/os/FileStore.cc
@@ -325,6 +325,13 @@ int FileStore::mkfs()
 
 int FileStore::mkjournal()
 {
+  // read fsid
+  char fn[PATH_MAX];
+  snprintf(fn, sizeof(fn), "%s/fsid", basedir.c_str());
+  int fd = ::open(fn, O_RDONLY, 0644);
+  ::read(fd, &fsid, sizeof(fsid));
+  ::close(fd);
+
   open_journal();
   if (journal) {
     int err = journal->create();