wip: assorted fixes for FreeBSD 9.1wip-port

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>

21 files changed, 53 insertions, 5 deletions

diff --git a/src/ceph_fuse.cc b/src/ceph_fuse.cc
index 54616f60f99..671eb0177df 100644
--- a/src/ceph_fuse.cc
+++ b/src/ceph_fuse.cc
@@ -32,7 +32,7 @@ using namespace std;
 #include "global/global_init.h"
 #include "common/safe_io.h"
        
-#ifndef DARWIN
+#if !defined(DARWIN) && !defined(__FreeBSD__)
 #include <envz.h>
 #endif // DARWIN
 
diff --git a/src/client/Client.cc b/src/client/Client.cc
index 709d632b235..f970d78bed8 100644
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -91,7 +91,13 @@ using namespace std;
 
 #define  tout(cct)       if (!cct->_conf->client_trace.empty()) traceout
 
+#ifndef O_RSYNC
+# define O_RSYNC O_SYNC
+#endif
 
+#ifndef O_DSYNC
+# define O_DSYNC O_SYNC
+#endif
 
 void client_flush_set_callback(void *p, ObjectCacher::ObjectSet *oset)
 {
diff --git a/src/cls/lock/cls_lock.cc b/src/cls/lock/cls_lock.cc
index 5f27c3cc4b1..ba4dac04580 100644
--- a/src/cls/lock/cls_lock.cc
+++ b/src/cls/lock/cls_lock.cc
@@ -28,6 +28,7 @@
 
 #include "global/global_context.h"
 
+#include "include/compat.h"
 
 using namespace rados::cls::lock;
 
diff --git a/src/cls/log/cls_log.cc b/src/cls/log/cls_log.cc
index 46ba357480c..b5676f93794 100644
--- a/src/cls/log/cls_log.cc
+++ b/src/cls/log/cls_log.cc
@@ -16,6 +16,8 @@
 
 #include "global/global_context.h"
 
+#include "include/compat.h"
+
 CLS_VER(1,0)
 CLS_NAME(log)
 
diff --git a/src/cls/log/cls_log_client.cc b/src/cls/log/cls_log_client.cc
index ea8adf11145..6aa29d4213b 100644
--- a/src/cls/log/cls_log_client.cc
+++ b/src/cls/log/cls_log_client.cc
@@ -4,6 +4,7 @@
 #include "cls/log/cls_log_ops.h"
 #include "include/rados/librados.hpp"
 
+#include "include/compat.h"
 
 using namespace librados;
 
diff --git a/src/cls/refcount/cls_refcount.cc b/src/cls/refcount/cls_refcount.cc
index 5e8edeb887a..6ec9744fac9 100644
--- a/src/cls/refcount/cls_refcount.cc
+++ b/src/cls/refcount/cls_refcount.cc
@@ -15,6 +15,8 @@
 
 #include "global/global_context.h"
 
+#include "include/compat.h"
+
 CLS_VER(1,0)
 CLS_NAME(refcount)
 
diff --git a/src/cls/rgw/cls_rgw.cc b/src/cls/rgw/cls_rgw.cc
index 2f5711ecb32..70b41b2dc5c 100644
--- a/src/cls/rgw/cls_rgw.cc
+++ b/src/cls/rgw/cls_rgw.cc
@@ -16,6 +16,8 @@
 
 #include "global/global_context.h"
 
+#include "include/compat.h"
+
 CLS_VER(1,0)
 CLS_NAME(rgw)
 
diff --git a/src/cls/rgw/cls_rgw_client.cc b/src/cls/rgw/cls_rgw_client.cc
index 165ca437987..204f4089b38 100644
--- a/src/cls/rgw/cls_rgw_client.cc
+++ b/src/cls/rgw/cls_rgw_client.cc
@@ -4,6 +4,8 @@
 #include "cls/rgw/cls_rgw_ops.h"
 #include "include/rados/librados.hpp"
 
+#include "include/compat.h"
+
 #include "common/debug.h"
 
 using namespace librados;
diff --git a/src/cls/version/cls_version.cc b/src/cls/version/cls_version.cc
index ea38072b19b..06526f73388 100644
--- a/src/cls/version/cls_version.cc
+++ b/src/cls/version/cls_version.cc
@@ -16,6 +16,8 @@
 
 #include "global/global_context.h"
 
+#include "include/compat.h"
+
 CLS_VER(1,0)
 CLS_NAME(version)
 
diff --git a/src/common/ipaddr.cc b/src/common/ipaddr.cc
index 55a13f392e2..f38f0cd2e26 100644
--- a/src/common/ipaddr.cc
+++ b/src/common/ipaddr.cc
@@ -3,10 +3,11 @@
 #include <arpa/inet.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/socket.h>
 
 #include "acconfig.h"
 
-#ifdef DARWIN
+#if defined(DARWIN) || defined(__FreeBSD__)
 #ifndef s6_addr16
 #define s6_addr16 __u6_addr.__u6_addr16
 #endif
diff --git a/src/common/xattr.c b/src/common/xattr.c
index 5ae399416da..5d850baabca 100644
--- a/src/common/xattr.c
+++ b/src/common/xattr.c
@@ -18,6 +18,9 @@
 
 #include "acconfig.h"
 
+#include <errno.h>
+#include <stdlib.h>
+
 /*
  * The original FreeBSD port below (now guarded by HAVE_EXTATTR) was using
  * FreeBSD specific string manipulation routines.
@@ -156,7 +159,7 @@ ssize_t ceph_os_fgetxattr(int fd, const char *name, void *value, size_t size)
 
 ssize_t ceph_os_listxattr(const char *path, char *list, size_t size)
 {
-	ssize_t error;
+	ssize_t error = 0;
 
 #ifdef HAVE_EXTATTR
 	/*
@@ -206,7 +209,7 @@ ssize_t ceph_os_listxattr(const char *path, char *list, size_t size)
 
 ssize_t ceph_os_flistxattr(int fd, char *list, size_t size)
 {
-	ssize_t error;
+	ssize_t error = 0;
 
 #ifdef HAVE_EXTATTR
 	/*
diff --git a/src/key_value_store/cls_kvs.cc b/src/key_value_store/cls_kvs.cc
index df54d975de8..6d3dbbf5322 100644
--- a/src/key_value_store/cls_kvs.cc
+++ b/src/key_value_store/cls_kvs.cc
@@ -12,6 +12,7 @@
 #include <iostream>
 #include <climits>
 
+#include "include/compat.h"
 
 cls_handle_t h_class;
 cls_method_handle_t h_get_idata_from_key;
diff --git a/src/log/Log.cc b/src/log/Log.cc
index a5eba2327f6..8579c3f9ae3 100644
--- a/src/log/Log.cc
+++ b/src/log/Log.cc
@@ -15,6 +15,8 @@
 #include "include/assert.h"
 #include "include/compat.h"
 
+#include "include/compat.h"
+
 #define DEFAULT_MAX_NEW    100
 #define DEFAULT_MAX_RECENT 10000
 
diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index 86b380f2827..566bf226368 100644
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -95,6 +95,8 @@
 
 #include "common/Timer.h"
 
+#include "include/compat.h"
+
 using namespace std;
 
 extern struct ceph_file_layout g_default_file_layout;
diff --git a/src/mon/LogMonitor.cc b/src/mon/LogMonitor.cc
index a545242577d..dbe69c3d12a 100644
--- a/src/mon/LogMonitor.cc
+++ b/src/mon/LogMonitor.cc
@@ -31,6 +31,8 @@
 #include "include/assert.h"
 #include "include/str_list.h"
 
+#include "include/compat.h"
+
 #define dout_subsys ceph_subsys_mon
 #undef dout_prefix
 #define dout_prefix _prefix(_dout, mon, get_last_committed())
diff --git a/src/os/FileJournal.cc b/src/os/FileJournal.cc
index c58181fbb8b..f43351c21f0 100644
--- a/src/os/FileJournal.cc
+++ b/src/os/FileJournal.cc
@@ -33,6 +33,9 @@
 
 #include "common/blkdev.h"
 
+#ifndef O_DSYNC
+# define O_DSYNC 0
+#endif
 
 #define dout_subsys ceph_subsys_journal
 #undef dout_prefix
diff --git a/src/test/filestore/store_test.cc b/src/test/filestore/store_test.cc
index 80c775052ec..6d84cde0e3b 100644
--- a/src/test/filestore/store_test.cc
+++ b/src/test/filestore/store_test.cc
@@ -29,6 +29,9 @@
 #include <boost/random/binomial_distribution.hpp>
 #include <gtest/gtest.h>
 
+#include <sys/param.h>
+#include <sys/mount.h>
+
 #include <ext/hash_map>
 using __gnu_cxx::hash_map;
 typedef boost::mt11213b gen_type;
diff --git a/src/test/libcephfs/test.cc b/src/test/libcephfs/test.cc
index 597d049e2a4..0d18bb2320f 100644
--- a/src/test/libcephfs/test.cc
+++ b/src/test/libcephfs/test.cc
@@ -20,7 +20,16 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <dirent.h>
+
+#include "acconfig.h"
+
+#ifdef HAVE_SYS_XATTR_H
 #include <sys/xattr.h>
+#endif
+
+#ifdef HAVE_SYS_EXTATTR_H
+#include <sys/extattr.h>
+#endif
 
 TEST(LibCephFS, OpenEmptyComponent) {
 
diff --git a/src/test/librados/io.cc b/src/test/librados/io.cc
index f1bcc060355..f851535eaaa 100644
--- a/src/test/librados/io.cc
+++ b/src/test/librados/io.cc
@@ -5,6 +5,8 @@
 #include <errno.h>
 #include "gtest/gtest.h"
 
+#include "include/compat.h"
+
 using namespace librados;
 using std::string;
 
diff --git a/src/test/testmsgr.cc b/src/test/testmsgr.cc
index 4de779b5d7f..c189bb5e993 100644
--- a/src/test/testmsgr.cc
+++ b/src/test/testmsgr.cc
@@ -28,7 +28,7 @@ using namespace std;
 #include "global/global_init.h"
 #include "common/ceph_argparse.h"
 
-#ifndef DARWIN
+#if !defined(DARWIN) && !defined(__FreeBSD__)
 #include <envz.h>
 #endif // DARWIN
 
diff --git a/src/tools/rados/rados.cc b/src/tools/rados/rados.cc
index 90fb2be5489..bb35bc81191 100644
--- a/src/tools/rados/rados.cc
+++ b/src/tools/rados/rados.cc
@@ -45,6 +45,8 @@ using namespace librados;
 
 #include "cls/lock/cls_lock_client.h"
 
+#include "include/compat.h"
+
 int rados_tool_sync(const std::map < std::string, std::string > &opts,
                              std::vector<const char*> &args);