Merge pull request #6385 from Vicente-Cheng/mkfs-does-not-decode-an-existing-superblock

osd: fix reactivate (check OSDSuperblock in mkfs() when we already have the superblock)

Reviewed-by: Loic Dachary <ldachary@redhat.com>

diff --cc src/osd/OSD.cc
Simple merge

diff --cc src/test/Makefile.am
index 7bbab2891206abc64f7da3235f4eacd6ff16e0d6,8da39135648c7effe0114a72d42a57165c24297a..448c9b46609b3d9417606daf7d25dc34fa29e850
--- 1/src/test/Makefile.am
--- 2/src/test/Makefile.am
+++ b/src/test/Makefile.am
@@@ -79,9 -79,9 +79,10 @@@ check_SCRIPTS += 
        test/mon/mkfs.sh \
        test/mon/mon-scrub.sh \
        test/osd/osd-scrub-repair.sh \
 +      test/osd/osd-scrub-snaps.sh \
        test/osd/osd-config.sh \
        test/osd/osd-bench.sh \
+       test/osd/osd-reactivate.sh \
        test/osd/osd-copy-from.sh \
        test/mon/mon-handle-forward.sh \
        test/libradosstriper/rados-striper.sh \