build: MacOSX Porting fixes

git@forge.gluster.org:~schafdog/glusterfs-core/osx-glusterfs

Working functionality on MacOSX

 - GlusterD (management daemon)
 - GlusterCLI (management cli)
 - GlusterFS FUSE (using OSXFUSE)
 - GlusterNFS (without NLM - issues with rpc.statd)

Change-Id: I20193d3f8904388e47344e523b3787dbeab044ac
BUG: 1089172
Signed-off-by: Harshavardhana <harsha@harshavardhana.net>
Signed-off-by: Dennis Schafroth <dennis@schafroth.com>
Tested-by: Harshavardhana <harsha@harshavardhana.net>
Tested-by: Dennis Schafroth <dennis@schafroth.com>
Reviewed-on: http://review.gluster.org/7503
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Anand Avati <avati@redhat.com>

2 files changed, 38 insertions, 37 deletions

diff --git a/xlators/debug/trace/src/trace.c b/xlators/debug/trace/src/trace.c
index c9d83935647..1efd50e656b 100644
--- a/xlators/debug/trace/src/trace.c
+++ b/xlators/debug/trace/src/trace.c
@@ -18,6 +18,44 @@
  *    Very helpful translator for debugging.
  */
 
+static inline void
+trace_stat_to_str(struct iatt *buf, char *str)
+{
+        char     atime_buf[256]    = {0,};
+        char     mtime_buf[256]    = {0,};
+        char     ctime_buf[256]    = {0,};
+        uint64_t ia_time           = 0;
+
+        if (!buf)
+                return;
+
+        ia_time = buf->ia_atime;
+        strftime (atime_buf, 256, "[%b %d %H:%M:%S]",
+                  localtime ((time_t *)&ia_time));
+        ia_time = buf->ia_mtime;
+        strftime (mtime_buf, 256, "[%b %d %H:%M:%S]",
+                  localtime ((time_t *)&ia_time));
+
+        ia_time = buf->ia_ctime;
+        strftime (ctime_buf, 256, "[%b %d %H:%M:%S]",
+                  localtime ((time_t *)&ia_time));
+
+        snprintf (str, sizeof (str),
+                  "gfid=%s ino=%"PRIu64", mode=%o, "
+                  "nlink=%"GF_PRI_NLINK", uid=%u, "
+                  "gid=%u, size=%"PRIu64", "
+                  "blocks=%"PRIu64", atime=%s, "
+                  "mtime=%s, ctime=%s",
+                  uuid_utoa (buf->ia_gfid),
+                  buf->ia_ino,
+                  st_mode_from_ia (buf->ia_prot, buf->ia_type),
+                  buf->ia_nlink, buf->ia_uid,
+                  buf->ia_gid, buf->ia_size,
+                  buf->ia_blocks, atime_buf,
+                  mtime_buf, ctime_buf);
+}
+
+
 int
 dump_history_trace (circular_buffer_t *cb, void *data)
 {
diff --git a/xlators/debug/trace/src/trace.h b/xlators/debug/trace/src/trace.h
index 045eefb3682..62d1bc9c921 100644
--- a/xlators/debug/trace/src/trace.h
+++ b/xlators/debug/trace/src/trace.h
@@ -59,40 +59,3 @@ typedef struct {
                                         "%s", _string);                 \
                 }                                                       \
         } while (0);
-
-#define trace_stat_to_str(buf, statstr)                                 \
-        do {                                                            \
-                char     atime_buf[256]    = {0,};                      \
-                char     mtime_buf[256]    = {0,};                      \
-                char     ctime_buf[256]    = {0,};                      \
-                uint64_t ia_time           = 0;                         \
-                                                                        \
-                if (!buf)                                               \
-                        break;                                          \
-                                                                        \
-                ia_time = buf->ia_atime;                                \
-                strftime (atime_buf, 256, "[%b %d %H:%M:%S]",           \
-                          localtime ((time_t *)&ia_time));              \
-                                                                        \
-                ia_time = buf->ia_mtime;                                \
-                strftime (mtime_buf, 256, "[%b %d %H:%M:%S]",           \
-                          localtime ((time_t *)&ia_time));              \
-                                                                        \
-                ia_time = buf->ia_ctime;                                \
-                strftime (ctime_buf, 256, "[%b %d %H:%M:%S]",           \
-                          localtime ((time_t *)&ia_time));              \
-                                                                        \
-                snprintf (statstr, sizeof (statstr),                    \
-                          "gfid=%s ino=%"PRIu64", mode=%o, "            \
-                          "nlink=%"GF_PRI_NLINK", uid=%u, "             \
-                          "gid=%u, size=%"PRIu64", "                    \
-                          "blocks=%"PRIu64", atime=%s, "                \
-                          "mtime=%s, ctime=%s",                         \
-                          uuid_utoa (buf->ia_gfid), buf->ia_ino,        \
-                          st_mode_from_ia (buf->ia_prot,                \
-                                           buf->ia_type),               \
-                          buf->ia_nlink, buf->ia_uid,                   \
-                          buf->ia_gid, buf->ia_size,                    \
-                          buf->ia_blocks, atime_buf,                    \
-                          mtime_buf, ctime_buf);                        \
-        } while (0);