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>

14 files changed, 268 insertions, 109 deletions

diff --git a/xlators/features/changelog/src/Makefile.am b/xlators/features/changelog/src/Makefile.am
index 54c21ac213c..c5d5e100e41 100644
--- a/xlators/features/changelog/src/Makefile.am
+++ b/xlators/features/changelog/src/Makefile.am
@@ -12,7 +12,7 @@ changelog_la_SOURCES = changelog.c changelog-rt.c changelog-helpers.c \
 changelog_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
 
 AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src -fPIC -D_FILE_OFFSET_BITS=64 \
-	-D_GNU_SOURCE -D$(GF_HOST_OS) -shared -nostartfiles -DDATADIR=\"$(localstatedir)\"
+	-D_GNU_SOURCE -D$(GF_HOST_OS) -shared -DDATADIR=\"$(localstatedir)\"
 
 AM_CFLAGS = -Wall $(GF_CFLAGS)
 
diff --git a/xlators/features/changelog/src/changelog-helpers.h b/xlators/features/changelog/src/changelog-helpers.h
index b441f706869..53588f55efa 100644
--- a/xlators/features/changelog/src/changelog-helpers.h
+++ b/xlators/features/changelog/src/changelog-helpers.h
@@ -268,9 +268,11 @@ typedef struct {
 
 void
 changelog_thread_cleanup (xlator_t *this, pthread_t thr_id);
-inline void *
+
+void *
 changelog_get_usable_buffer (changelog_local_t *local);
-inline void
+
+void
 changelog_set_usable_record_and_length (changelog_local_t *local,
                                         size_t len, int xr);
 void
@@ -290,16 +292,16 @@ int
 changelog_inject_single_event (xlator_t *this,
                                changelog_priv_t *priv,
                                changelog_log_data_t *cld);
-inline size_t
+size_t
 changelog_entry_length ();
-inline int
+int
 changelog_write (int fd, char *buffer, size_t len);
 int
 changelog_write_change (changelog_priv_t *priv, char *buffer, size_t len);
-inline int
+int
 changelog_handle_change (xlator_t *this,
                          changelog_priv_t *priv, changelog_log_data_t *cld);
-inline void
+void
 changelog_update (xlator_t *this, changelog_priv_t *priv,
                   changelog_local_t *local, changelog_log_type type);
 void *
diff --git a/xlators/features/compress/src/Makefile.am b/xlators/features/compress/src/Makefile.am
index 0bf757c063e..263b21b783b 100644
--- a/xlators/features/compress/src/Makefile.am
+++ b/xlators/features/compress/src/Makefile.am
@@ -10,7 +10,7 @@ cdc_la_SOURCES = cdc.c cdc-helper.c
 cdc_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
 
 AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -D$(GF_HOST_OS) \
--shared -nostartfiles  $(LIBZ_CFLAGS)
+-shared $(LIBZ_CFLAGS)
 
 AM_CFLAGS = -Wall $(GF_CFLAGS)
 
diff --git a/xlators/features/index/src/index.c b/xlators/features/index/src/index.c
index 5c1c65fbd21..4b2eb2e29ba 100644
--- a/xlators/features/index/src/index.c
+++ b/xlators/features/index/src/index.c
@@ -497,13 +497,13 @@ fop_fxattrop_index_action (xlator_t *this, inode_t *inode, dict_t *xattr)
         _xattrop_index_action (this, inode, xattr);
 }
 
-inline gf_boolean_t
+static inline gf_boolean_t
 index_xattrop_track (loc_t *loc, gf_xattrop_flags_t flags, dict_t *dict)
 {
         return (flags == GF_XATTROP_ADD_ARRAY);
 }
 
-inline gf_boolean_t
+static inline gf_boolean_t
 index_fxattrop_track (fd_t *fd, gf_xattrop_flags_t flags, dict_t *dict)
 {
         return (flags == GF_XATTROP_ADD_ARRAY);
diff --git a/xlators/features/locks/src/inodelk.c b/xlators/features/locks/src/inodelk.c
index e7093e60ed5..2d9aa83eca4 100644
--- a/xlators/features/locks/src/inodelk.c
+++ b/xlators/features/locks/src/inodelk.c
@@ -35,7 +35,7 @@ __pl_inodelk_ref (pl_inode_lock_t *lock)
         lock->ref++;
 }
 
-void
+inline void
 __pl_inodelk_unref (pl_inode_lock_t *lock)
 {
         lock->ref--;
diff --git a/xlators/features/locks/src/posix.c b/xlators/features/locks/src/posix.c
index 2db327687f3..337623d6577 100644
--- a/xlators/features/locks/src/posix.c
+++ b/xlators/features/locks/src/posix.c
@@ -294,7 +294,7 @@ pl_locks_by_fd (pl_inode_t *pl_inode, fd_t *fd)
        {
 
                list_for_each_entry (l, &pl_inode->ext_list, list) {
-                       if ((l->fd_num == fd_to_fdnum(fd))) {
+                       if (l->fd_num == fd_to_fdnum(fd)) {
                                found = 1;
                                break;
                        }
@@ -319,7 +319,7 @@ delete_locks_of_fd (xlator_t *this, pl_inode_t *pl_inode, fd_t *fd)
        {
 
                list_for_each_entry_safe (l, tmp, &pl_inode->ext_list, list) {
-                       if ((l->fd_num == fd_to_fdnum(fd))) {
+                       if (l->fd_num == fd_to_fdnum(fd)) {
                                if (l->blocked) {
                                        list_move_tail (&l->list, &blocked_list);
                                        continue;
@@ -644,7 +644,8 @@ pl_fgetxattr_handle_lockinfo (xlator_t *this, fd_t *fd,
         pl_inode_t    *pl_inode = NULL;
         char          *key      = NULL, *buf = NULL;
         int32_t        op_ret   = 0;
-        unsigned long  fdnum    = 0, len = 0;
+        unsigned long  fdnum    = 0;
+	int32_t        len      = 0;
         dict_t        *tmp      = NULL;
 
         pl_inode = pl_inode_get (this, fd->inode);
@@ -1340,7 +1341,7 @@ __fd_has_locks (pl_inode_t *pl_inode, fd_t *fd)
         posix_lock_t *l     = NULL;
 
         list_for_each_entry (l, &pl_inode->ext_list, list) {
-                if ((l->fd_num == fd_to_fdnum(fd))) {
+                if (l->fd_num == fd_to_fdnum(fd)) {
                         found = 1;
                         break;
                 }
@@ -1369,7 +1370,7 @@ __dup_locks_to_fdctx (pl_inode_t *pl_inode, fd_t *fd,
         int ret = 0;
 
         list_for_each_entry (l, &pl_inode->ext_list, list) {
-                if ((l->fd_num == fd_to_fdnum(fd))) {
+                if (l->fd_num == fd_to_fdnum(fd)) {
                         duplock = lock_dup (l);
                         if (!duplock) {
                                 ret = -1;
diff --git a/xlators/features/mac-compat/src/Makefile.am b/xlators/features/mac-compat/src/Makefile.am
index f8567edce71..42ed350e93e 100644
--- a/xlators/features/mac-compat/src/Makefile.am
+++ b/xlators/features/mac-compat/src/Makefile.am
@@ -6,9 +6,10 @@ mac_compat_la_LDFLAGS = -module -avoid-version
 mac_compat_la_SOURCES = mac-compat.c
 mac_compat_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
 
+noinst_HEADERS = mac-compat.h
+
 AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src
 
 AM_CFLAGS = -Wall $(GF_CFLAGS)
 
-CLEANFILES = 
-
+CLEANFILES =
diff --git a/xlators/features/mac-compat/src/mac-compat.c b/xlators/features/mac-compat/src/mac-compat.c
index 7cb550ad581..0eaf563e889 100644
--- a/xlators/features/mac-compat/src/mac-compat.c
+++ b/xlators/features/mac-compat/src/mac-compat.c
@@ -15,35 +15,28 @@
 #include "xlator.h"
 #include "defaults.h"
 #include "compat-errno.h"
+#include "syscall.h"
+#include "mem-pool.h"
+#include "mac-compat.h"
 
-
-enum apple_xattr {
-        GF_FINDER_INFO_XATTR,
-        GF_RESOURCE_FORK_XATTR,
-        GF_XATTR_ALL,
-        GF_XATTR_NONE
-};
-
-static char *apple_xattr_name[] = {
-        [GF_FINDER_INFO_XATTR]   = "com.apple.FinderInfo",
-        [GF_RESOURCE_FORK_XATTR] = "com.apple.ResourceFork"
-};
-
-static const char *apple_xattr_value[] = {
-        [GF_FINDER_INFO_XATTR]   =
-        /* 1 2 3 4 5 6 7 8 */
-         "\0\0\0\0\0\0\0\0"
-         "\0\0\0\0\0\0\0\0"
-         "\0\0\0\0\0\0\0\0"
-         "\0\0\0\0\0\0\0\0",
-        [GF_RESOURCE_FORK_XATTR] = ""
-};
-
-static int32_t apple_xattr_len[] = {
-        [GF_FINDER_INFO_XATTR]   = 32,
-        [GF_RESOURCE_FORK_XATTR] = 1
-};
-
+static int
+dict_key_remove_namespace(dict_t *dict, char *key, data_t *value, void *data)
+{
+  /*
+    char buffer[3*value->len+1];
+    int index = 0;
+    for (index = 0; index < value->len; index++)
+    sprintf(buffer+3*index, " %02x", value->data[index]);
+  */
+        xlator_t *this = (xlator_t *) data;
+        if (strncmp(key, "user.", 5) == 0) {
+                dict_set (dict, key + 5, value);
+                gf_log (this->name, GF_LOG_DEBUG,
+                        "remove_namespace_dict: %s -> %s ", key, key + 5);
+                dict_del (dict, key);
+        }
+        return 0;
+}
 
 int32_t
 maccomp_getxattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
@@ -53,54 +46,91 @@ maccomp_getxattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
         intptr_t ax = (intptr_t)this->private;
         int i = 0;
 
+        gf_log (this->name, GF_LOG_DEBUG,
+                "getxattr_cbk: dict %p private: %p xdata %p ", dict,
+                this->private, xdata);
+
+        if (dict) {
+                dict_foreach(dict, dict_key_remove_namespace, this);
+        }
+        else {
+                // TODO: we expect dict to exist here, don't know why this
+                // this is needed
+                dict = dict_new();
+        }
+        gf_log (this->name, GF_LOG_DEBUG,
+                "getxattr_cbk: dict %p ax: %ld op_ret %d op_err %d  ", dict, ax,
+                op_ret, op_errno);
         if ((ax == GF_XATTR_ALL && op_ret >= 0) || ax != GF_XATTR_NONE) {
                 op_ret = op_errno = 0;
-
                 for (i = 0; i < GF_XATTR_ALL; i++) {
                         if (dict_get (dict, apple_xattr_name[i]))
                                 continue;
-
+                        /* set dummy data */
+                        gf_log (this->name, GF_LOG_DEBUG,
+                                "getxattr_cbk: setting dummy data %p, %s", dict,
+                                apple_xattr_name[i]);
                         if (dict_set (dict, apple_xattr_name[i],
                                       bin_to_data ((void *)apple_xattr_value[i],
                                                    apple_xattr_len[i])) == -1) {
                                 op_ret = -1;
-                                op_errno = ENOMEM;
+                                op_errno = ENOATTR;
 
                                 break;
                         }
                 }
          }
-
         STACK_UNWIND_STRICT (getxattr, frame, op_ret, op_errno, dict, xdata);
-
         return 0;
 }
 
 
-int32_t
-maccomp_getxattr (call_frame_t *frame, xlator_t *this, loc_t *loc,
-                  const char *name, dict_t *xdata)
+static
+int prepend_xattr_user_namespace(dict_t *dict, char *key, data_t *value, void *obj)
 {
-        intptr_t ax = GF_XATTR_NONE;
-        int i = 0;
+        xlator_t *this = (xlator_t *) obj;
+        dict_t *newdict = (dict_t *) this->private;
+        char *newkey = NULL;
+        gf_add_prefix(XATTR_USER_PREFIX, key, &newkey);
+        key = newkey;
+        dict_set(newdict, (char *)key, value);
+        if (newkey)
+                GF_FREE(newkey);
+        return 0;
+}
 
+intptr_t
+check_name(const char *name, char **newkey)
+{
+        intptr_t ax = GF_XATTR_NONE;
         if (name) {
+                int i = 0;
                 for (i = 0; i < GF_XATTR_ALL; i++) {
                         if (strcmp (apple_xattr_name[i], name) == 0) {
                                 ax = i;
-
                                 break;
                         }
                 }
+                gf_add_prefix("user.", name, newkey);
         } else
                 ax = GF_XATTR_ALL;
+        return ax;
+}
 
-        this->private = (void *)ax;
+int32_t
+maccomp_getxattr (call_frame_t *frame, xlator_t *this, loc_t *loc,
+                  const char *name, dict_t *xdata)
+{
+        char *newkey = NULL;
+        this->private = (void *) check_name(name, &newkey);
 
+        gf_log (this->name, GF_LOG_DEBUG,
+                "getxattr: name %s private: %p xdata %p ", name,
+                this->private, xdata);
         STACK_WIND (frame, maccomp_getxattr_cbk,
                     FIRST_CHILD(this),
                     FIRST_CHILD(this)->fops->getxattr,
-                    loc, name, xdata);
+                    loc, newkey, xdata);
         return 0;
 }
 
@@ -109,30 +139,17 @@ int32_t
 maccomp_fgetxattr (call_frame_t *frame, xlator_t *this, fd_t *fd,
                    const char *name, dict_t *xdata)
 {
-        intptr_t ax = GF_XATTR_NONE;
-        int i = 0;
-
-        if (name) {
-                for (i = 0; i < GF_XATTR_ALL; i++) {
-                        if (strcmp (apple_xattr_name[i], name) == 0) {
-                                ax = i;
-
-                                break;
-                        }
-                }
-        } else
-                ax = GF_XATTR_ALL;
-
-        this->private = (void *)ax;
+        char *newkey = NULL;
+        this->private = (void *) check_name(name, &newkey);
 
         STACK_WIND (frame, maccomp_getxattr_cbk,
                     FIRST_CHILD(this),
                     FIRST_CHILD(this)->fops->fgetxattr,
-                    fd, name, xdata);
+                    fd, newkey, xdata);
+        GF_FREE(newkey);
         return 0;
 }
 
-
 int32_t
 maccomp_setxattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                       int32_t op_ret, int32_t op_errno, dict_t *xdata)
@@ -141,12 +158,56 @@ maccomp_setxattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
 
         if (op_ret == -1 && ax != GF_XATTR_NONE)
                 op_ret = op_errno = 0;
-
+        gf_log (this->name, GF_LOG_DEBUG,
+                "setxattr_cbk op_ret %d op_errno %d private: %p xdata %p ",
+                op_ret, op_errno, this->private, xdata);
         STACK_UNWIND_STRICT (setxattr, frame, op_ret, op_errno, xdata);
+        return 0;
+}
 
+int32_t
+maccomp_setattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
+                     int32_t op_ret, int32_t op_errno, struct iatt *iatt1,
+                     struct iatt *iattr2, dict_t *xdata)
+{
+        gf_log (this->name, GF_LOG_DEBUG,
+                "setattr_cbk op_ret %d op_errno %d private: %p xdata %p ",
+                op_ret, op_errno, this->private, xdata);
+        STACK_UNWIND_STRICT (setattr, frame, op_ret, op_errno,
+                             iatt1, iattr2, xdata);
         return 0;
 }
 
+int map_flags(int flags)
+{
+        /* DARWIN has different defines on XATTR_ flags.
+           There do not seem to be a POSIX standard
+           Parse any other flags over.
+           NOFOLLOW is always true on Linux and Darwin
+        */
+        int linux_flags = flags & ~(GF_XATTR_CREATE | GF_XATTR_REPLACE | XATTR_REPLACE);
+        if (XATTR_CREATE & flags)
+                linux_flags |= GF_XATTR_CREATE;
+        if (XATTR_REPLACE & flags)
+                linux_flags |= GF_XATTR_REPLACE;
+        return linux_flags;
+}
+
+int32_t
+maccomp_fremovexattr (call_frame_t *frame, xlator_t *this, fd_t *fd,
+                   const char *name, dict_t *xdata)
+{
+        char *newkey = NULL;
+
+        this->private = (void *) check_name(name, &newkey);
+
+        STACK_WIND (frame, default_fremovexattr_cbk,
+                    FIRST_CHILD(this),
+                    FIRST_CHILD(this)->fops->fremovexattr,
+                    fd, newkey, xdata);
+        GF_FREE(newkey);
+        return 0;
+}
 
 int32_t
 maccomp_setxattr (call_frame_t *frame, xlator_t *this, loc_t *loc, dict_t *dict,
@@ -162,16 +223,56 @@ maccomp_setxattr (call_frame_t *frame, xlator_t *this, loc_t *loc, dict_t *dict,
                         break;
                 }
         }
+        dict_t *newdict = dict_new();
+        this->private = (void *) newdict;
+        dict_foreach(dict, prepend_xattr_user_namespace, this);
 
         this->private = (void *)ax;
-
+        int linux_flags = map_flags(flags);
+        gf_log (this->name, GF_LOG_DEBUG,
+                "setxattr flags: %d -> %d dict %p private: %p xdata %p ",
+                flags, linux_flags, dict, this->private, xdata);
         STACK_WIND (frame, maccomp_setxattr_cbk,
                     FIRST_CHILD(this),
                     FIRST_CHILD(this)->fops->setxattr,
-                    loc, dict, flags, xdata);
+                    loc, newdict, linux_flags, xdata);
+        dict_unref(newdict);
         return 0;
 }
 
+int32_t
+maccomp_setattr (call_frame_t *frame, xlator_t *this, loc_t *loc, struct iatt *iattr,
+                  int32_t flags, dict_t *xdata)
+{
+        gf_log (this->name, GF_LOG_DEBUG,
+                "setattr iattr %p private: %p xdata %p ",
+                iattr, this->private, xdata);
+        STACK_WIND (frame, maccomp_setattr_cbk,
+                    FIRST_CHILD(this),
+                    FIRST_CHILD(this)->fops->setattr,
+                    loc, iattr, flags, xdata);
+        return 0;
+}
+
+int32_t
+maccomp_removexattr (call_frame_t *frame, xlator_t *this, loc_t *loc,
+                     const char *name, dict_t *xdata)
+{
+        char *newkey = NULL;
+        this->private = (void *) check_name(name, &newkey);
+
+        STACK_WIND (frame, default_removexattr_cbk,
+                    FIRST_CHILD(this),
+                    FIRST_CHILD(this)->fops->removexattr,
+                    loc, newkey, xdata);
+
+        gf_log (this->name, GF_LOG_TRACE,
+                "removeattr name %p private: %p xdata %p ",
+                name, this->private, xdata);
+        GF_FREE(newkey);
+        return 0;
+
+}
 
 int32_t
 maccomp_fsetxattr (call_frame_t *frame, xlator_t *this, fd_t *fd, dict_t *dict,
@@ -188,12 +289,20 @@ maccomp_fsetxattr (call_frame_t *frame, xlator_t *this, fd_t *fd, dict_t *dict,
                 }
         }
 
-        this->private = (void *)ax;
+        dict_t *newdict = dict_new();
+        this->private = (void *) newdict;
+        dict_foreach(dict, prepend_xattr_user_namespace, this);
 
+        this->private = (void *)ax;
+        int linux_flags = map_flags(flags);
+        gf_log (this->name, GF_LOG_DEBUG,
+                "fsetxattr flags: %d -> %d dict %p private: %p xdata %p ",
+                flags, linux_flags, dict, this->private, xdata);
         STACK_WIND (frame, maccomp_setxattr_cbk,
                     FIRST_CHILD(this),
                     FIRST_CHILD(this)->fops->fsetxattr,
-                    fd, dict, flags, xdata);
+                    fd, newdict, linux_flags, xdata);
+        dict_unref(newdict);
         return 0;
 }
 
@@ -224,10 +333,13 @@ fini (xlator_t *this)
 
 
 struct xlator_fops fops = {
-        .getxattr    = maccomp_getxattr,
-        .fgetxattr   = maccomp_fgetxattr,
-        .setxattr    = maccomp_setxattr,
-        .fsetxattr   = maccomp_fsetxattr,
+        .getxattr       = maccomp_getxattr,
+        .fgetxattr      = maccomp_fgetxattr,
+        .setxattr       = maccomp_setxattr,
+        .setattr        = maccomp_setattr,
+        .fsetxattr      = maccomp_fsetxattr,
+        .removexattr    = maccomp_removexattr,
+        .fremovexattr   = maccomp_fremovexattr,
 };
 
 struct xlator_cbks cbks;
diff --git a/xlators/features/mac-compat/src/mac-compat.h b/xlators/features/mac-compat/src/mac-compat.h
new file mode 100644
index 00000000000..b033ca0e4d8
--- /dev/null
+++ b/xlators/features/mac-compat/src/mac-compat.h
@@ -0,0 +1,41 @@
+/*
+   Copyright (c) 2014 Red Hat, Inc. <http://www.redhat.com>
+   This file is part of GlusterFS.
+
+   This file is licensed to you under your choice of the GNU Lesser
+   General Public License, version 3 or any later version (LGPLv3 or
+   later), or the GNU General Public License, version 2 (GPLv2), in all
+   cases as published by the Free Software Foundation.
+*/
+
+#ifndef __MAC_COMPAT_H__
+#define __MAC_COMPAT_H__
+
+enum apple_xattr {
+        GF_FINDER_INFO_XATTR,
+        GF_RESOURCE_FORK_XATTR,
+        GF_XATTR_ALL,
+        GF_XATTR_NONE
+};
+
+static char *apple_xattr_name[] = {
+        [GF_FINDER_INFO_XATTR]   = "com.apple.FinderInfo",
+        [GF_RESOURCE_FORK_XATTR] = "com.apple.ResourceFork"
+};
+
+static const char *apple_xattr_value[] = {
+        [GF_FINDER_INFO_XATTR]   =
+        /* 1 2 3 4 5 6 7 8 */
+         "\0\0\0\0\0\0\0\0"
+         "\0\0\0\0\0\0\0\0"
+         "\0\0\0\0\0\0\0\0"
+         "\0\0\0\0\0\0\0\0",
+        [GF_RESOURCE_FORK_XATTR] = ""
+};
+
+static int32_t apple_xattr_len[] = {
+        [GF_FINDER_INFO_XATTR]   = 32,
+        [GF_RESOURCE_FORK_XATTR] = 1
+};
+
+#endif /* __MAC_COMPAT_H__ */
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;
diff --git a/xlators/features/quota/src/quota.c b/xlators/features/quota/src/quota.c
index 4beaae34188..2ca4da0c15f 100644
--- a/xlators/features/quota/src/quota.c
+++ b/xlators/features/quota/src/quota.c
@@ -244,7 +244,7 @@ out:
         return;
 }
 
-inline void
+static inline void
 quota_link_count_decrement (quota_local_t *local)
 {
         call_stub_t *stub       = NULL;
@@ -270,7 +270,7 @@ out:
         return;
 }
 
-inline void
+static inline void
 quota_handle_validate_error (quota_local_t *local, int32_t op_ret,
                              int32_t op_errno)
 {
@@ -377,7 +377,7 @@ quota_timeout (struct timeval *tv, int32_t timeout)
         return timed_out;
 }
 
-inline void
+static inline void
 quota_add_parent (quota_dentry_t *dentry, struct list_head *list)
 {
         quota_dentry_t *entry = NULL;
@@ -928,7 +928,7 @@ err:
         return 0;
 }
 
-inline int
+static inline int
 quota_get_limits (xlator_t *this, dict_t *dict, int64_t *hard_lim,
                   int64_t *soft_lim)
 {
diff --git a/xlators/features/quota/src/quotad-aggregator.c b/xlators/features/quota/src/quotad-aggregator.c
index f3f65ca2a04..5f13fd251c2 100644
--- a/xlators/features/quota/src/quotad-aggregator.c
+++ b/xlators/features/quota/src/quotad-aggregator.c
@@ -227,7 +227,7 @@ quotad_aggregator_getlimit (rpcsvc_request_t *req)
         if (ret)
                 goto err;
 
-        ret = dict_set_int32 (state->xdata, GET_ANCESTRY_PATH_KEY,42);
+        ret = dict_set_int32 (state->xdata, GET_ANCESTRY_PATH_KEY, 42);
         if (ret)
                 goto err;