Changeset 9249

Timestamp:

03/14/12 02:55:14 (14 months ago)

Author:

k

Message:

Fix for MacOSX where getmattr and setmattr require an additional argument.

Location:

branches/stable

Files:

• configure.in (modified) (1 diff)
• src/apps/user/getmattr.c (modified) (3 diffs)
• src/apps/user/setmattr.c (modified) (5 diffs)

branches/stable/configure.in

@@ -1175 +1175 @@
         AC_MSG_RESULT(yes)
         AC_DEFINE(HAVE_FGETXATTR_EXTRA_ARGS, 1, Define if fgetxattr takes position and option arguments),
+        AC_MSG_RESULT(no)
+)
+
+dnl
+dnl check if setxattr takes extra arguments
+AC_MSG_CHECKING([for setxattr extra arguments])
+AC_TRY_COMPILE([
+        #include <sys/types.h>
+        #ifdef HAVE_ATTR_XATTR_H
+        #include <attr/xattr.h>
+        #endif
+        #ifdef HAVE_SYS_XATTR_H
+        #include <sys/xattr.h>
+        #endif
+        ],
+        [
+        setxattr(0, 0, 0, 0, 0, 0);
+        ],
+        AC_MSG_RESULT(yes)
+        AC_DEFINE(HAVE_SETXATTR_EXTRA_ARGS, 1, Define if setxattr takes position and option arguments),
+        AC_MSG_RESULT(no)
+)
+
+dnl
+dnl check if getxattr takes extra arguments
+AC_MSG_CHECKING([for getxattr extra arguments])
+AC_TRY_COMPILE([
+        #include <sys/types.h>
+        #ifdef HAVE_ATTR_XATTR_H
+        #include <attr/xattr.h>
+        #endif
+        #ifdef HAVE_SYS_XATTR_H
+        #include <sys/xattr.h>
+        #endif
+        ],
+        [
+        getxattr(0, 0, 0, 0, 0, 0);
+        ],
+        AC_MSG_RESULT(yes)
+        AC_DEFINE(HAVE_GETXATTR_EXTRA_ARGS, 1, Define if getxattr takes position and option arguments),
         AC_MSG_RESULT(no)
 )

branches/stable/src/apps/user/getmattr.c

@@ -5 +5 @@
  */
 
+#include "pvfs2-config.h"
 #include <unistd.h>
 #include <stdio.h>
@@ -58 +59 @@
     /*Get the mirroring attributes for the given file*/
     if (my_args.mode) {
+#ifdef HAVE_GETXATTR_EXTRA_ARGS
+       ret = getxattr(my_args.filename
+                     ,"user.pvfs2.mirror.mode"
+                     ,&mode
+                     ,sizeof(mode)
+                     ,0
+                     ,0 );
+#else
        ret = getxattr(my_args.filename
                      ,"user.pvfs2.mirror.mode"
                      ,&mode
                      ,sizeof(mode) );
+#endif
        if (!ret)
           perror("Failure to get mirror mode");
@@ -89 +99 @@
 
     if (my_args.copies){
+#ifdef HAVE_GETXATTR_EXTRA_ARGS
+        ret = getxattr(my_args.filename
+                      ,"user.pvfs2.mirror.copies"
+                      ,&(copies)
+                      ,sizeof(copies)
+                      ,0
+                      ,0);
+#else
         ret = getxattr(my_args.filename
                       ,"user.pvfs2.mirror.copies"
                       ,&(copies)
                       ,sizeof(copies) );
+#endif
         if (!ret)
            perror("Failure to get mirror copies");

branches/stable/src/apps/user/setmattr.c

@@ -5 +5 @@
  */
 
+#include "pvfs2-config.h"
 #include <unistd.h>
 #include <stdio.h>
@@ -58 +59 @@
        printf("Setting mirror mode to %d\n"
              ,my_args.mode);
+#ifdef HAVE_SETXATTR_EXTRA_ARGS
+       ret = setxattr(my_args.filename
+                     ,"user.pvfs2.mirror.mode"
+                     ,&(my_args.mode)
+                     ,sizeof(my_args.mode)
+                     ,0
+                     ,0);
+#else
        ret = setxattr(my_args.filename
                      ,"user.pvfs2.mirror.mode"
@@ -63 +72 @@
                      ,sizeof(my_args.mode)
                      ,0);
+#endif
        if (ret)
           perror("Failure to set mirror mode");
@@ -70 +80 @@
         printf("Setting number of mirrored copies to %d\n"
           ,my_args.copies);
+#ifdef HAVE_SETXATTR_EXTRA_ARGS
+        ret = setxattr(my_args.filename
+                      ,"user.pvfs2.mirror.copies"
+                      ,&(my_args.copies)
+                      ,sizeof(my_args.copies)
+                      ,0
+                      ,0);
+#else
         ret = setxattr(my_args.filename
                       ,"user.pvfs2.mirror.copies"
@@ -75 +93 @@
                       ,sizeof(my_args.copies)
                       ,0);
+#endif
         if (ret)
            perror("Failure to set mirror copies");