osd: remove unused parameter 'dev' in OSD::mkfs function

Signed-off-by: Yao Guotao <yaoguot@gmail.com>

diff --git a/src/ceph_osd.cc b/src/ceph_osd.cc
index 3bce0e2a6ccb22ab45134a334e4f599efadf90cd..b658f16dfed910d0241a8589a39e4a4326513051 100644 (file)
--- a/src/ceph_osd.cc
+++ b/src/ceph_osd.cc
@@ -331,8 +331,7 @@ int main(int argc, const char **argv)
       forker.exit(-EINVAL);
     }
 
-    int err = OSD::mkfs(g_ceph_context, store, data_path,
-                       g_conf().get_val<uuid_d>("fsid"),
+    int err = OSD::mkfs(g_ceph_context, store, g_conf().get_val<uuid_d>("fsid"),
                         whoami);
     if (err < 0) {
       derr << TEXT_RED << " ** ERROR: error creating empty object store in "

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 0c275e93f911730a600faae553baa99ae337b723..24676289847df53c6f1789196a7bb04e04f35817 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -1853,8 +1853,7 @@ int heap(CephContext& cct, const cmdmap_t& cmdmap, Formatter& f, std::ostream& o
  
 }} // namespace ceph::osd_cmds
 
-int OSD::mkfs(CephContext *cct, ObjectStore *store, const string &dev,
-             uuid_d fsid, int whoami)
+int OSD::mkfs(CephContext *cct, ObjectStore *store, uuid_d fsid, int whoami)
 {
   int ret;
 

diff --git a/src/osd/OSD.h b/src/osd/OSD.h
index 6e62344930ad7d9e6713ffef78d06253d9482bd6..784a3fa54d04476135555ebd0deb4cd15d7d10c3 100644 (file)
--- a/src/osd/OSD.h
+++ b/src/osd/OSD.h
@@ -2254,9 +2254,8 @@ private:
   ~OSD() override;
 
   // static bits
-  static int mkfs(CephContext *cct, ObjectStore *store,
-                 const string& dev,
-                 uuid_d fsid, int whoami);
+  static int mkfs(CephContext *cct, ObjectStore *store, uuid_d fsid, int whoami);
+
   /* remove any non-user xattrs from a map of them */
   void filter_xattrs(map<string, bufferptr>& attrs) {
     for (map<string, bufferptr>::iterator iter = attrs.begin();