From: Sage Weil <sage@inktank.com>
Date: Tue, 22 May 2012 18:39:44 +0000 (-0700)
Subject: osd: require cluster fsid for mkfs
X-Git-Tag: v0.48argonaut~151^2~26^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5bf5e91fd199e9ede82197a16c6aa506eb832a0a;p=ceph.git

osd: require cluster fsid for mkfs

Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 39d14ab10542..7c7ba3d6a356 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -307,6 +307,12 @@ int OSD::mkfs(const std::string &dev, const std::string &jdev, uuid_d fsid, int
       dout(0) << " have superblock" << dendl;
     } else {
       // create superblock
+      if (fsid.is_zero()) {
+	derr << "must specify cluster fsid" << dendl;
+	ret = -EINVAL;
+	goto umount_store;
+      }
+
       sb.cluster_fsid = fsid;
       sb.osd_fsid = store->get_fsid();
       sb.whoami = whoami;