added features/mac-compat

Signed-off-by: Csaba Henk <csaba@gluster.com>
Signed-off-by: Anand V. Avati <avati@dev.gluster.com>

BUG: 800 (Problem on OSX with NFS and CIFS exports)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=800

6 files changed, 310 insertions, 127 deletions

diff --git a/xlators/features/Makefile.am b/xlators/features/Makefile.am
index 303767d350f..6496f3ab0c9 100644
--- a/xlators/features/Makefile.am
+++ b/xlators/features/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS = locks trash quota read-only access-control #path-converter # filter
+SUBDIRS = locks trash quota read-only access-control mac-compat #path-converter # filter
 
 CLEANFILES = 
diff --git a/xlators/features/mac-compat/Makefile.am b/xlators/features/mac-compat/Makefile.am
new file mode 100644
index 00000000000..d471a3f9243
--- /dev/null
+++ b/xlators/features/mac-compat/Makefile.am
@@ -0,0 +1,3 @@
+SUBDIRS = src
+
+CLEANFILES = 
diff --git a/xlators/features/mac-compat/src/Makefile.am b/xlators/features/mac-compat/src/Makefile.am
new file mode 100644
index 00000000000..915c13e308f
--- /dev/null
+++ b/xlators/features/mac-compat/src/Makefile.am
@@ -0,0 +1,13 @@
+xlator_LTLIBRARIES = mac-compat.la
+xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features
+
+mac_compat_la_LDFLAGS = -module -avoidversion
+
+mac_compat_la_SOURCES = mac-compat.c
+mac_compat_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+
+AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS) \
+	-I$(top_srcdir)/libglusterfs/src -shared -nostartfiles $(GF_CFLAGS)
+
+CLEANFILES = 
+
diff --git a/xlators/features/mac-compat/src/mac-compat.c b/xlators/features/mac-compat/src/mac-compat.c
new file mode 100644
index 00000000000..649d2ad5db4
--- /dev/null
+++ b/xlators/features/mac-compat/src/mac-compat.c
@@ -0,0 +1,247 @@
+/*
+  Copyright (c) 2008-2010 Gluster, Inc. <http://www.gluster.com>
+  This file is part of GlusterFS.
+
+  GlusterFS is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published
+  by the Free Software Foundation; either version 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see
+  <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef _CONFIG_H
+#define _CONFIG_H
+#include "config.h"
+#endif
+
+#include "xlator.h"
+#include "defaults.h"
+#include "compat-errno.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
+};
+
+
+int32_t
+maccomp_getxattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
+                      int32_t op_ret, int32_t op_errno, dict_t *dict)
+{
+        intptr_t ax = (intptr_t)this->private;
+        int i = 0;
+
+        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;
+
+                        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;
+
+                                break;
+                        }
+                }
+         }
+
+        STACK_UNWIND_STRICT (getxattr, frame, op_ret, op_errno, dict);
+
+        return 0;
+}
+
+
+int32_t
+maccomp_getxattr (call_frame_t *frame, xlator_t *this, loc_t *loc,
+                  const char *name)
+{
+        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;
+
+        STACK_WIND (frame, maccomp_getxattr_cbk,
+                    FIRST_CHILD(this),
+                    FIRST_CHILD(this)->fops->getxattr,
+                    loc, name);
+        return 0;
+}
+
+
+int32_t
+maccomp_fgetxattr (call_frame_t *frame, xlator_t *this, fd_t *fd,
+                   const char *name)
+{
+        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;
+
+        STACK_WIND (frame, maccomp_getxattr_cbk,
+                    FIRST_CHILD(this),
+                    FIRST_CHILD(this)->fops->fgetxattr,
+                    fd, name);
+        return 0;
+}
+
+
+int32_t
+maccomp_setxattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
+                      int32_t op_ret, int32_t op_errno)
+{
+        intptr_t ax = (intptr_t)this->private;
+
+        if (op_ret == -1 && ax != GF_XATTR_NONE)
+                op_ret = op_errno = 0;
+
+        STACK_UNWIND_STRICT (setxattr, frame, op_ret, op_errno);
+
+        return 0;
+}
+
+
+int32_t
+maccomp_setxattr (call_frame_t *frame, xlator_t *this, loc_t *loc, dict_t *dict,
+                  int32_t flags)
+{
+        intptr_t ax = GF_XATTR_NONE;
+        int i = 0;
+
+        for (i = 0; i < GF_XATTR_ALL; i++) {
+                if (dict_get (dict, apple_xattr_name[i])) {
+                        ax = i;
+
+                        break;
+                }
+        }
+
+        this->private = (void *)ax;
+
+        STACK_WIND (frame, maccomp_setxattr_cbk,
+                    FIRST_CHILD(this),
+                    FIRST_CHILD(this)->fops->setxattr,
+                    loc, dict, flags);
+        return 0;
+}
+
+
+int32_t
+maccomp_fsetxattr (call_frame_t *frame, xlator_t *this, fd_t *fd, dict_t *dict,
+                   int32_t flags)
+{
+        intptr_t ax = GF_XATTR_NONE;
+        int i = 0;
+
+        for (i = 0; i < GF_XATTR_ALL; i++) {
+                if (dict_get (dict, apple_xattr_name[i])) {
+                        ax = i;
+
+                        break;
+                }
+        }
+
+        this->private = (void *)ax;
+
+        STACK_WIND (frame, maccomp_setxattr_cbk,
+                    FIRST_CHILD(this),
+                    FIRST_CHILD(this)->fops->fsetxattr,
+                    fd, dict, flags);
+        return 0;
+}
+
+
+int32_t
+init (xlator_t *this)
+{
+        if (!this->children || this->children->next) {
+                gf_log (this->name, GF_LOG_ERROR,
+                        "translator not configured with exactly one child");
+                return -1;
+        }
+
+        if (!this->parents) {
+                gf_log (this->name, GF_LOG_WARNING,
+                        "dangling volume. check volfile ");
+        }
+
+        return 0;
+}
+
+
+void
+fini (xlator_t *this)
+{
+        return;
+}
+
+
+struct xlator_fops fops = {
+        .getxattr    = maccomp_getxattr,
+        .fgetxattr   = maccomp_fgetxattr,
+        .setxattr    = maccomp_setxattr,
+        .fsetxattr   = maccomp_fsetxattr,
+};
+
+struct xlator_cbks cbks = {
+};
+
+struct volume_options options[] = {
+        { .key = {NULL} },
+};
diff --git a/xlators/mount/fuse/src/fuse-bridge.c b/xlators/mount/fuse/src/fuse-bridge.c
index 9f210aa73ba..1adbddadf68 100644
--- a/xlators/mount/fuse/src/fuse-bridge.c
+++ b/xlators/mount/fuse/src/fuse-bridge.c
@@ -53,9 +53,6 @@
 #include "list.h"
 #include "dict.h"
 
-#include "compat.h"
-#include "compat-errno.h"
-
 /* TODO: when supporting posix acl, remove this definition */
 #define DISABLE_POSIX_ACL
 
@@ -69,6 +66,7 @@
 #define MAX_FUSE_PROC_DELAY 1
 
 static int gf_fuse_conn_err_log;
+static int gf_fuse_xattr_enotsup_log;
 
 typedef struct fuse_in_header fuse_in_header_t;
 typedef void (fuse_handler_t) (xlator_t *this, fuse_in_header_t *finh,
@@ -1087,11 +1085,9 @@ fuse_setattr (xlator_t *this, fuse_in_header_t *finh, void *msg)
 }
 
 
-static int gf_fuse_xattr_enotsup_log;
 static int
-fuse_fsync_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                int32_t op_ret, int32_t op_errno, struct iatt *prebuf,
-                struct iatt *postbuf)
+fuse_err_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
+              int32_t op_ret, int32_t op_errno)
 {
         fuse_state_t *state = frame->root->state;
         fuse_in_header_t *finh = state->finh;
@@ -1104,32 +1100,12 @@ fuse_fsync_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
 
                 send_fuse_err (this, finh, 0);
         } else {
-                if (frame->root->op == GF_FOP_SETXATTR) {
-                        op_ret = gf_compat_setxattr (state->dict);
-                        if (op_ret == 0)
-                                op_errno = 0;
-                        if (op_errno == ENOTSUP) {
-                                gf_fuse_xattr_enotsup_log++;
-                                if (!(gf_fuse_xattr_enotsup_log % GF_UNIVERSAL_ANSWER))
-                                        gf_log ("glusterfs-fuse",
-                                                GF_LOG_CRITICAL,
-                                                "extended attribute not "
-                                                "supported by the backend "
-                                                "storage");
-                        }
-                } else {
-                        if ((frame->root->op == GF_FOP_REMOVEXATTR)
-                            && (op_errno == ENOATTR)) {
-                                goto nolog;
-                        }
-                        gf_log ("glusterfs-fuse", GF_LOG_WARNING,
-                                "%"PRIu64": %s() %s => -1 (%s)",
-                                frame->root->unique,
-                                gf_fop_list[frame->root->op],
-                                state->loc.path ? state->loc.path : "ERR",
-                                strerror (op_errno));
-                }
-        nolog:
+                gf_log ("glusterfs-fuse", GF_LOG_WARNING,
+                        "%"PRIu64": %s() %s => -1 (%s)",
+                        frame->root->unique,
+                        gf_fop_list[frame->root->op],
+                        state->loc.path ? state->loc.path : "ERR",
+                        strerror (op_errno));
 
                 send_fuse_err (this, finh, op_errno);
         }
@@ -1142,54 +1118,25 @@ fuse_fsync_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
 
 
 static int
-fuse_err_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-              int32_t op_ret, int32_t op_errno)
+fuse_fsync_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
+                int32_t op_ret, int32_t op_errno, struct iatt *prebuf,
+                struct iatt *postbuf)
 {
-        fuse_state_t *state = frame->root->state;
-        fuse_in_header_t *finh = state->finh;
-
-        if (op_ret == 0) {
-                gf_log ("glusterfs-fuse", GF_LOG_TRACE,
-                        "%"PRIu64": %s() %s => 0", frame->root->unique,
-                        gf_fop_list[frame->root->op],
-                        state->loc.path ? state->loc.path : "ERR");
-
-                send_fuse_err (this, finh, 0);
-        } else {
-                if (frame->root->op == GF_FOP_SETXATTR) {
-                        op_ret = gf_compat_setxattr (state->dict);
-                        if (op_ret == 0)
-                                op_errno = 0;
-                        if (op_errno == ENOTSUP) {
-                                gf_fuse_xattr_enotsup_log++;
-                                if (!(gf_fuse_xattr_enotsup_log % GF_UNIVERSAL_ANSWER))
-                                        gf_log ("glusterfs-fuse",
-                                                GF_LOG_CRITICAL,
-                                                "extended attribute not "
-                                                "supported by the backend "
-                                                "storage");
-                        }
-                } else {
-                        if ((frame->root->op == GF_FOP_REMOVEXATTR)
-                            && (op_errno == ENOATTR)) {
-                                goto nolog;
-                        }
-                        gf_log ("glusterfs-fuse", GF_LOG_WARNING,
-                                "%"PRIu64": %s() %s => -1 (%s)",
-                                frame->root->unique,
-                                gf_fop_list[frame->root->op],
-                                state->loc.path ? state->loc.path : "ERR",
-                                strerror (op_errno));
-                }
-        nolog:
+        return fuse_err_cbk (frame, cookie, this, op_ret, op_errno);
+}
 
-                send_fuse_err (this, finh, op_errno);
-        }
 
-        free_state (state);
-        STACK_DESTROY (frame->root);
+static int
+fuse_setxattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
+                   int32_t op_ret, int32_t op_errno)
+{
+        if (op_ret == -1 && op_errno == ENOTSUP)
+                GF_LOG_OCCASIONALLY (gf_fuse_xattr_enotsup_log,
+                                     "glusterfs-fuse", GF_LOG_CRITICAL,
+                                     "extended attribute not supported "
+                                     "by the backend storage");
 
-        return 0;
+        return fuse_err_cbk (frame, cookie, this, op_ret, op_errno);
 }
 
 
@@ -2448,7 +2395,7 @@ fuse_setxattr (xlator_t *this, fuse_in_header_t *finh, void *msg)
                 "%"PRIu64": SETXATTR %s/%"PRIu64" (%s)", finh->unique,
                 state->loc.path, finh->nodeid, name);
 
-        FUSE_FOP (state, fuse_err_cbk, GF_FOP_SETXATTR,
+        FUSE_FOP (state, fuse_setxattr_cbk, GF_FOP_SETXATTR,
                   setxattr, &state->loc, state->dict, fsi->flags);
 
         return;
@@ -2485,47 +2432,19 @@ fuse_xattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
         char           *value = "";
         fuse_state_t   *state = NULL;
         fuse_in_header_t *finh = NULL;
-        int32_t         dummy_ret = 0;
         data_t         *value_data = NULL;
         fuse_private_t *priv = NULL;
         struct stat     st;
         char           *file = NULL;
         int32_t         fd = -1;
-        int             ret = -1;
         int32_t         len = 0;
         data_pair_t    *trav = NULL;
 
         priv  = this->private;
-        ret   = op_ret;
         state = frame->root->state;
         finh  = state->finh;
-        dummy_ret = 0;
-
-#ifdef GF_DARWIN_HOST_OS
-        /* This is needed in MacFuse, where MacOSX Finder needs some specific
-         * keys to be supported from FS
-         */
-
-        if (state->name) {
-                if (!dict) {
-                        dict = get_new_dict ();
-                        need_to_free_dict = 1;
-                }
-                dummy_ret = gf_compat_getxattr (state->name, dict);
-                if (dummy_ret != -1)
-                        ret = dummy_ret;
-        } else {
-                if (!dict) {
-                        dict = get_new_dict ();
-                        need_to_free_dict = 1;
-                }
-                dummy_ret = gf_compat_listxattr (ret, dict, state->size);
-                if (dummy_ret != -1)
-                        ret = dummy_ret;
-        }
-#endif /* DARWIN */
 
-        if (ret >= 0) {
+        if (op_ret >= 0) {
                 gf_log ("glusterfs-fuse", GF_LOG_TRACE,
                         "%"PRIu64": %s() %s => %d", frame->root->unique,
                         gf_fop_list[frame->root->op], state->loc.path, op_ret);
@@ -2535,17 +2454,15 @@ fuse_xattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                         /* if callback for getxattr */
                         value_data = dict_get (dict, state->name);
                         if (value_data) {
-                                ret = value_data->len; /* Don't return the value for '\0' */
-                                value = value_data->data;
-
-                                send_fuse_xattr (this, finh, value, ret, state->size);
-                                /* if(ret >...)...else if...else */
+                                send_fuse_xattr (this, finh, value_data->data,
+                                                 value_data->len, /* Don't return the value for '\0' */
+                                                 state->size);
+                                /* if(op_ret >...)...else if...else */
                         }  else if (!strcmp (state->name, "user.glusterfs-booster-volfile")) {
                                 if (!priv->volfile) {
                                         memset (&st, 0, sizeof (st));
                                         fd = fileno (this->ctx->specfp);
-                                        ret = fstat (fd, &st);
-                                        if (ret != 0) {
+                                        if (fstat (fd, &st) != 0) {
                                                 gf_log (this->name,
                                                         GF_LOG_ERROR,
                                                         "fstat on fd (%d) failed (%s)", fd, strerror (errno));
@@ -2555,15 +2472,15 @@ fuse_xattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                                         priv->volfile_size = st.st_size;
                                         file = priv->volfile = GF_CALLOC (1, priv->volfile_size,
                                                                           gf_fuse_mt_char);
-                                        ret = lseek (fd, 0, SEEK_SET);
-                                        while ((ret = read (fd, file, GF_UNIT_KB)) > 0) {
-                                                file += ret;
+                                        len = lseek (fd, 0, SEEK_SET);
+                                        while ((len = read (fd, file, GF_UNIT_KB)) > 0) {
+                                                file += len;
                                         }
                                 }
 
                                 send_fuse_xattr (this, finh, priv->volfile,
                                                  priv->volfile_size, state->size);
-                                /* if(ret >...)...else if...else */
+                                /* if(op_ret >...)...else if...else */
                         } else if (!strcmp (state->name, "user.glusterfs-booster-path")) {
                                 send_fuse_xattr (this, finh, state->loc.path,
                                                  strlen (state->loc.path) + 1, state->size);
@@ -2597,12 +2514,12 @@ fuse_xattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                 if (op_errno != ENODATA) {
                         if (op_errno == ENOTSUP)
                         {
-                                gf_fuse_xattr_enotsup_log++;
-                                if (!(gf_fuse_xattr_enotsup_log % GF_UNIVERSAL_ANSWER))
-                                        gf_log ("glusterfs-fuse", GF_LOG_ERROR,
-                                                "extended attribute not "
-                                                "supported by the backend "
-                                                "storage");
+                                GF_LOG_OCCASIONALLY (gf_fuse_xattr_enotsup_log,
+                                                     "glusterfs-fuse",
+                                                     GF_LOG_ERROR,
+                                                     "extended attribute not "
+                                                     "supported by the backend "
+                                                     "storage");
                         }
                         else
                         {
diff --git a/xlators/storage/posix/src/posix.c b/xlators/storage/posix/src/posix.c
index 677aa0270da..22e9fcecb23 100644
--- a/xlators/storage/posix/src/posix.c
+++ b/xlators/storage/posix/src/posix.c
@@ -3025,7 +3025,7 @@ posix_getxattr (call_frame_t *frame, xlator_t *this,
 {
         struct posix_private *priv  = NULL;
         int32_t  op_ret         = -1;
-        int32_t  op_errno       = ENOENT;
+        int32_t  op_errno       = 0;
         int32_t  list_offset    = 0;
         size_t   size           = 0;
         size_t   remaining_size = 0;
@@ -3134,8 +3134,11 @@ posix_getxattr (call_frame_t *frame, xlator_t *this,
                 }
 
                 op_ret = sys_lgetxattr (real_path, key, value, op_ret);
-                if (op_ret == -1)
+                if (op_ret == -1) {
+                        op_errno = errno;
+
                         break;
+                }
 
                 value [op_ret] = '\0';
                 if (strcmp (key, gen_key) != 0)