summaryrefslogtreecommitdiffstats
path: root/libglusterfs
diff options
context:
space:
mode:
authorRavishankar N <ravishankar@redhat.com>2015-01-01 15:16:41 +0000
committerVijay Bellur <vbellur@redhat.com>2015-01-05 22:00:09 -0800
commitc4ab37c02e9edc23d0637e23d6f2b42d0827dad2 (patch)
tree0dc06a6b8288ff8f33b47ad7d98ee4daffe74af4 /libglusterfs
parentb8e3b91b8180dcc5e9f8bb62734832ace69ad143 (diff)
libglusterfs: change signature of syncop_(f)getxattr
Pass xdata dict to syncop_(f)getxattr calls. This patch [1/3] is required as a part of afr automated split-brain resolution implementation. Change-Id: I3970b3dd6daf64681a031e37f8e9afb14fb3d668 BUG: 1136769 Signed-off-by: Ravishankar N <ravishankar@redhat.com> Reviewed-on: http://review.gluster.org/9375 Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com> Reviewed-by: Niels de Vos <ndevos@redhat.com> Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Shyamsundar Ranganathan <srangana@redhat.com> Reviewed-by: Vijay Bellur <vbellur@redhat.com>
Diffstat (limited to 'libglusterfs')
-rw-r--r--libglusterfs/src/syncop.c10
-rw-r--r--libglusterfs/src/syncop.h6
2 files changed, 10 insertions, 6 deletions
diff --git a/libglusterfs/src/syncop.c b/libglusterfs/src/syncop.c
index e830d830229..c2794732522 100644
--- a/libglusterfs/src/syncop.c
+++ b/libglusterfs/src/syncop.c
@@ -1388,12 +1388,13 @@ syncop_listxattr (xlator_t *subvol, loc_t *loc, dict_t **dict)
}
int
-syncop_getxattr (xlator_t *subvol, loc_t *loc, dict_t **dict, const char *key)
+syncop_getxattr (xlator_t *subvol, loc_t *loc, dict_t **dict, const char *key,
+ dict_t *xdata)
{
struct syncargs args = {0, };
SYNCOP (subvol, (&args), syncop_getxattr_cbk, subvol->fops->getxattr,
- loc, key, NULL);
+ loc, key, xdata);
if (dict)
*dict = args.xattr;
@@ -1406,12 +1407,13 @@ syncop_getxattr (xlator_t *subvol, loc_t *loc, dict_t **dict, const char *key)
}
int
-syncop_fgetxattr (xlator_t *subvol, fd_t *fd, dict_t **dict, const char *key)
+syncop_fgetxattr (xlator_t *subvol, fd_t *fd, dict_t **dict, const char *key,
+ dict_t *xdata)
{
struct syncargs args = {0, };
SYNCOP (subvol, (&args), syncop_getxattr_cbk, subvol->fops->fgetxattr,
- fd, key, NULL);
+ fd, key, xdata);
if (dict)
*dict = args.xattr;
diff --git a/libglusterfs/src/syncop.h b/libglusterfs/src/syncop.h
index 249abb3d331..e95dd6fc33d 100644
--- a/libglusterfs/src/syncop.h
+++ b/libglusterfs/src/syncop.h
@@ -368,8 +368,10 @@ int syncop_statfs (xlator_t *subvol, loc_t *loc, dict_t *xattr_req,
int syncop_setxattr (xlator_t *subvol, loc_t *loc, dict_t *dict, int32_t flags);
int syncop_fsetxattr (xlator_t *subvol, fd_t *fd, dict_t *dict, int32_t flags);
int syncop_listxattr (xlator_t *subvol, loc_t *loc, dict_t **dict);
-int syncop_getxattr (xlator_t *xl, loc_t *loc, dict_t **dict, const char *key);
-int syncop_fgetxattr (xlator_t *xl, fd_t *fd, dict_t **dict, const char *key);
+int syncop_getxattr (xlator_t *xl, loc_t *loc, dict_t **dict, const char *key,
+ dict_t *xdata);
+int syncop_fgetxattr (xlator_t *xl, fd_t *fd, dict_t **dict, const char *key,
+ dict_t *xdata);
int syncop_removexattr (xlator_t *subvol, loc_t *loc, const char *name,
dict_t *xdata);
int syncop_fremovexattr (xlator_t *subvol, fd_t *fd, const char *name,