diff options
| author | Jeff Darcy <jdarcy@redhat.com> | 2014-03-04 14:42:40 +0000 |
|---|---|---|
| committer | Jeff Darcy <jdarcy@redhat.com> | 2014-03-04 14:42:40 +0000 |
| commit | 0de07f4189cbd191a765c60ed3d7c72f72112e68 (patch) | |
| tree | 83781a0df06c9110c6f3db12caad23ea00832b53 /extras/geo-rep/gsync-sync-gfid.c | |
| parent | c28972ea53cc7cdb91c7aac01754dd7f0b66e1a7 (diff) | |
| parent | 9f45d0f6212d6d5c96dafc4aba73d9d12b39c3d6 (diff) | |
Merge branch 'upstream' into merge
Signed-off-by: Jeff Darcy <jdarcy@redhat.com>
Conflicts:
api/src/glfs-fops.c
libglusterfs/src/syncop.c
libglusterfs/src/syncop.h
Change-Id: I8c3fa7a20fb167d9e6bc2749e177c0c8b366827b
Diffstat (limited to 'extras/geo-rep/gsync-sync-gfid.c')
| -rw-r--r-- | extras/geo-rep/gsync-sync-gfid.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/extras/geo-rep/gsync-sync-gfid.c b/extras/geo-rep/gsync-sync-gfid.c index 601f4720e..953eb5351 100644 --- a/extras/geo-rep/gsync-sync-gfid.c +++ b/extras/geo-rep/gsync-sync-gfid.c @@ -4,10 +4,11 @@ #include <string.h> #include <limits.h> #include <sys/types.h> -#include <attr/xattr.h> #include <libgen.h> #include <ctype.h> #include <stdlib.h> +#include "glusterfs.h" +#include "syscall.h" #ifndef UUID_CANONICAL_FORM_LEN #define UUID_CANONICAL_FORM_LEN 36 @@ -86,8 +87,8 @@ main (int argc, char *argv[]) memcpy (tmp_blob, bname, strlen (bname)); - ret = setxattr (parent_dir, GF_FUSE_AUX_GFID_HEAL, blob, len, - 0); + ret = sys_lsetxattr (parent_dir, GF_FUSE_AUX_GFID_HEAL, + blob, len, 0); if (ret < 0) { fprintf (stderr, "setxattr on %s/%s failed (%s)\n", parent_dir, bname, strerror (errno)); |