Trival: fix a -Wunused-label warning in compiling.

os/filestore/FileStore.cc: In member function ‘int FileStore::_zero(const coll_t&, const ghobject_t&, uint64_t, size_t)’: os/filestore/FileStore.cc:3328:2: warning: label ‘out’ defined but not used [-Wunused-label] out: ^ Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
ceph · Mar 30, 2016 · 3d3c7e6 · 3d3c7e6
1 parent 72ea178
commit 3d3c7e6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/mon/MDSMonitor.cc b/src/mon/MDSMonitor.cc
@@ -2112,7 +2112,6 @@ int MDSMonitor::filesystem_command(
 {
   dout(4) << __func__ << " prefix='" << prefix << "'" << dendl;
   op->mark_mdsmon_event(__func__);
-  MMonCommand *m = static_cast<MMonCommand*>(op->get_req());
   int r = 0;
   string whostr;
   cmd_getval(g_ceph_context, cmdmap, "who", whostr);

diff --git a/src/os/filestore/FileStore.cc b/src/os/filestore/FileStore.cc
@@ -3325,7 +3325,13 @@ int FileStore::_zero(const coll_t& cid, const ghobject_t& oid, uint64_t offset,
     ret = _write(cid, oid, offset, len, bl);
   }
 
+#ifdef CEPH_HAVE_FALLOCATE
+# if !defined(DARWIN) && !defined(__FreeBSD__)
+#    ifdef FALLOC_FL_KEEP_SIZE
  out:
+#    endif
+# endif
+#endif
   dout(20) << "zero " << cid << "/" << oid << " " << offset << "~" << len << " = " << ret << dendl;
   return ret;
 }