Merge PR #24874 into master

* refs/pull/24874/head:
	os/filestore: collect partition/device metadata from journal
	os/filestore: include journal in get_devices result

Reviewed-by: Rick Chen <rick.chen@prophetstor.com>
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>

diff --cc .githubmap
index 4c2d41a82119e07d137d60499cb2e2bbe79080fb,4c2d41a82119e07d137d60499cb2e2bbe79080fb..a0aecda1a3b0159492ebdac92fc6d41d7cc24dd9
--- 1/.githubmap
--- 2/.githubmap
+++ b/.githubmap
@@@ -89,3 -89,3 +89,4 @@@ dillaman Jason Dillaman <dillaman@redha
  batrick Patrick Donnelly <pdonnell@redhat.com>
  noahdesu Noah Watkins <nwatkins@redhat.com>
  tserong Tim Serong <tserong@suse.com>
++hsiang41 Rick Chen <rick.chen@prophetstor.com>

diff --cc src/os/filestore/FileStore.cc
Simple merge