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>

3 files changed, 21 insertions, 19 deletions

diff --git a/xlators/features/marker/src/marker-quota-helper.h b/xlators/features/marker/src/marker-quota-helper.h
index 6cdd148810b..b200413b0ad 100644
--- a/xlators/features/marker/src/marker-quota-helper.h
+++ b/xlators/features/marker/src/marker-quota-helper.h
@@ -9,7 +9,7 @@
 */
 
 #ifndef _MARKER_QUOTA_HELPER_H
-#define _MARKER_QUOTA_HELPER
+#define _MARKER_QUOTA_HELPER_H
 
 #ifndef _CONFIG_H
 #define _CONFIG_H
diff --git a/xlators/features/marker/src/marker-quota.c b/xlators/features/marker/src/marker-quota.c
index a758e938f69..1903fdc4052 100644
--- a/xlators/features/marker/src/marker-quota.c
+++ b/xlators/features/marker/src/marker-quota.c
@@ -365,7 +365,10 @@ mq_update_size_xattr (call_frame_t *frame, void *cookie, xlator_t *this,
                 local->loc.path, ntoh64 (*delta));
 
         new_dict = dict_new ();
-        if (!new_dict);
+        if (!new_dict) {
+		errno = ENOMEM;
+		goto err;
+	}
 
         ret = dict_set_bin (new_dict, QUOTA_SIZE_KEY, delta, 8);
         if (ret)
@@ -385,7 +388,6 @@ mq_update_size_xattr (call_frame_t *frame, void *cookie, xlator_t *this,
 err:
         if (op_ret == -1 || ret == -1) {
                 local->err = -1;
-
                 mq_release_lock_on_dirty_inode (frame, NULL, this, 0, 0, NULL);
         }
 
diff --git a/xlators/features/marker/src/marker.c b/xlators/features/marker/src/marker.c
index a27a266f004..adcf3d8e7b8 100644
--- a/xlators/features/marker/src/marker.c
+++ b/xlators/features/marker/src/marker.c
@@ -255,18 +255,18 @@ out:
         return 0;
 }
 
-int32_t
+gf_boolean_t
 call_from_special_client (call_frame_t *frame, xlator_t *this, const char *name)
 {
         struct volume_mark     *vol_mark   = NULL;
         marker_conf_t          *priv       = NULL;
-        gf_boolean_t            ret        = _gf_true;
+        gf_boolean_t           is_true     = _gf_true;
 
         priv = (marker_conf_t *)this->private;
 
         if (frame->root->pid != GF_CLIENT_PID_GSYNCD || name == NULL ||
             strcmp (name, MARKER_XATTR_PREFIX "." VOLUME_MARK) != 0) {
-                ret = _gf_false;
+                is_true = _gf_false;
                 goto out;
         }
 
@@ -274,7 +274,7 @@ call_from_special_client (call_frame_t *frame, xlator_t *this, const char *name)
 
         marker_getxattr_stampfile_cbk (frame, this, name, vol_mark, NULL);
 out:
-        return ret;
+        return is_true;
 }
 
 int32_t
@@ -348,10 +348,10 @@ int32_t
 marker_getxattr (call_frame_t *frame, xlator_t *this, loc_t *loc,
                  const char *name, dict_t *xdata)
 {
-        gf_boolean_t   ret    = _gf_false;
-        marker_conf_t *priv   = NULL;
-        unsigned long  cookie = 0;
-        marker_local_t *local = NULL;
+        gf_boolean_t    is_true  = _gf_false;
+        marker_conf_t   *priv    = NULL;
+        unsigned long   cookie   = 0;
+        marker_local_t  *local   = NULL;
 
         priv = this->private;
 
@@ -362,16 +362,15 @@ marker_getxattr (call_frame_t *frame, xlator_t *this, loc_t *loc,
 
         MARKER_INIT_LOCAL (frame, local);
 
-        ret = loc_copy (&local->loc, loc);
-        if (ret < 0)
-                goto out;
+        if ((loc_copy (&local->loc, loc)) < 0)
+		goto out;
 
         gf_log (this->name, GF_LOG_DEBUG, "USER:PID = %d", frame->root->pid);
 
         if (priv && priv->feature_enabled & GF_XTIME)
-                ret = call_from_special_client (frame, this, name);
+                is_true = call_from_special_client (frame, this, name);
 
-        if (ret == _gf_false) {
+        if (is_true == _gf_false) {
                 if (name == NULL) {
                         /* Signifies that marker translator
                          * has to filter the quota's xattr's,
@@ -380,10 +379,11 @@ marker_getxattr (call_frame_t *frame, xlator_t *this, loc_t *loc,
                          */
                         cookie = 1;
                 }
-                STACK_WIND_COOKIE (frame, marker_getxattr_cbk, (void *)cookie,
+                STACK_WIND_COOKIE (frame, marker_getxattr_cbk,
+				   (void *)cookie,
                                    FIRST_CHILD(this),
-                                   FIRST_CHILD(this)->fops->getxattr, loc,
-                                   name, xdata);
+                                   FIRST_CHILD(this)->fops->getxattr,
+				   loc, name, xdata);
         }
 
         return 0;