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>

6 files changed, 16 insertions, 14 deletions

diff --git a/xlators/cluster/afr/src/afr-self-heal-metadata.c b/xlators/cluster/afr/src/afr-self-heal-metadata.c
index 7c0d5cb08c6..0518c1821e3 100644
--- a/xlators/cluster/afr/src/afr-self-heal-metadata.c
+++ b/xlators/cluster/afr/src/afr-self-heal-metadata.c
@@ -53,7 +53,8 @@ __afr_selfheal_metadata_do (call_frame_t *frame, xlator_t *this, inode_t *inode,
 	gf_log (this->name, GF_LOG_INFO, "performing metadata selfheal on %s",
 		uuid_utoa (inode->gfid));
 
-	ret = syncop_getxattr (priv->children[source], &loc, &xattr, NULL);
+	ret = syncop_getxattr (priv->children[source], &loc, &xattr, NULL,
+                               NULL);
 	if (ret < 0) {
 		ret = -EIO;
                 goto out;
@@ -76,7 +77,8 @@ __afr_selfheal_metadata_do (call_frame_t *frame, xlator_t *this, inode_t *inode,
 		if (ret)
 			healed_sinks[i] = 0;
 
-		ret = syncop_getxattr (priv->children[i], &loc, &old_xattr, 0);
+		ret = syncop_getxattr (priv->children[i], &loc, &old_xattr, 0,
+                                       NULL);
 		if (old_xattr) {
 			afr_delete_ignorable_xattrs (old_xattr);
 			ret = syncop_removexattr (priv->children[i], &loc, "",
diff --git a/xlators/cluster/afr/src/afr-self-heald.c b/xlators/cluster/afr/src/afr-self-heald.c
index 29f34107481..7426e9290a9 100644
--- a/xlators/cluster/afr/src/afr-self-heald.c
+++ b/xlators/cluster/afr/src/afr-self-heald.c
@@ -89,7 +89,7 @@ afr_shd_is_subvol_local (xlator_t *this, int subvol)
 	uuid_copy (loc.gfid, loc.inode->gfid);
 
 	ret = syncop_getxattr (priv->children[subvol], &loc, &xattr,
-			       GF_XATTR_PATHINFO_KEY);
+			       GF_XATTR_PATHINFO_KEY, NULL);
 	if (ret) {
 		is_local = _gf_false;
                 goto out;
@@ -236,7 +236,7 @@ afr_shd_index_opendir (xlator_t *this, int child)
 	uuid_copy (rootloc.gfid, rootloc.inode->gfid);
 
 	ret = syncop_getxattr (subvol, &rootloc, &xattr,
-			       GF_XATTROP_INDEX_GFID);
+			       GF_XATTROP_INDEX_GFID, NULL);
 	if (ret || !xattr) {
 		errno = -ret;
 		goto out;
@@ -948,7 +948,7 @@ afr_shd_gfid_to_path (xlator_t *this, xlator_t *subvol, uuid_t gfid, char **path
 	uuid_copy (loc.gfid, gfid);
 	loc.inode = inode_new (this->itable);
 
-	ret = syncop_getxattr (subvol, &loc, &xattr, GFID_TO_PATH_KEY);
+	ret = syncop_getxattr (subvol, &loc, &xattr, GFID_TO_PATH_KEY, NULL);
 	if (ret)
 		goto out;
 
@@ -1192,7 +1192,7 @@ afr_shd_get_index_count (xlator_t *this, int i, uint64_t *count)
 	uuid_copy (rootloc.gfid, rootloc.inode->gfid);
 
 	ret = syncop_getxattr (subvol, &rootloc, &xattr,
-			       GF_XATTROP_INDEX_COUNT);
+			       GF_XATTROP_INDEX_COUNT, NULL);
 	if (ret < 0)
 		goto out;
 
diff --git a/xlators/cluster/dht/src/dht-helper.c b/xlators/cluster/dht/src/dht-helper.c
index e7ae5c2b002..c25646c3c5d 100644
--- a/xlators/cluster/dht/src/dht-helper.c
+++ b/xlators/cluster/dht/src/dht-helper.c
@@ -921,11 +921,11 @@ dht_migration_complete_check_task (void *data)
 
         if (!local->loc.inode) {
                 ret = syncop_fgetxattr (src_node, local->fd, &dict,
-                                        conf->link_xattr_name);
+                                        conf->link_xattr_name, NULL);
         } else {
                 SYNCTASK_SETID (0, 0);
                 ret = syncop_getxattr (src_node, &local->loc, &dict,
-                                       conf->link_xattr_name);
+                                       conf->link_xattr_name, NULL);
                 SYNCTASK_SETID (frame->root->uid, frame->root->gid);
         }
 
@@ -1136,11 +1136,11 @@ dht_rebalance_inprogress_task (void *data)
         if (local->loc.inode) {
                 SYNCTASK_SETID (0, 0);
                 ret = syncop_getxattr (src_node, &local->loc, &dict,
-                                       conf->link_xattr_name);
+                                       conf->link_xattr_name, NULL);
                 SYNCTASK_SETID (frame->root->uid, frame->root->gid);
         } else {
                 ret = syncop_fgetxattr (src_node, local->fd, &dict,
-                                        conf->link_xattr_name);
+                                        conf->link_xattr_name, NULL);
         }
 
         if (ret < 0) {
diff --git a/xlators/cluster/dht/src/dht-rebalance.c b/xlators/cluster/dht/src/dht-rebalance.c
index 2ca636c4564..66b84ba96e9 100644
--- a/xlators/cluster/dht/src/dht-rebalance.c
+++ b/xlators/cluster/dht/src/dht-rebalance.c
@@ -1541,7 +1541,7 @@ gf_defrag_migrate_data (xlator_t *this, gf_defrag_info_t *defrag, loc_t *loc,
                         }
 
                         ret = syncop_getxattr (this, &entry_loc, &dict,
-                                               GF_XATTR_NODE_UUID_KEY);
+                                               GF_XATTR_NODE_UUID_KEY, NULL);
                         if(ret < 0) {
                                 gf_msg (this->name, GF_LOG_ERROR, 0,
                                         DHT_MSG_MIGRATE_FILE_FAILED,
@@ -1588,7 +1588,7 @@ gf_defrag_migrate_data (xlator_t *this, gf_defrag_info_t *defrag, loc_t *loc,
                          * migrated */
 
                         ret = syncop_getxattr (this, &entry_loc, NULL,
-                                               GF_XATTR_LINKINFO_KEY);
+                                               GF_XATTR_LINKINFO_KEY, NULL);
                         if (ret < 0) {
                                 if (-ret != ENODATA) {
                                         loglevel = GF_LOG_ERROR;
diff --git a/xlators/features/locks/src/posix.c b/xlators/features/locks/src/posix.c
index 603bc585b4d..610297abec7 100644
--- a/xlators/features/locks/src/posix.c
+++ b/xlators/features/locks/src/posix.c
@@ -550,7 +550,7 @@ fetch_pathinfo (xlator_t *this, inode_t *inode, int32_t *op_errno,
         loc.inode = inode_ref (inode);
 
         ret = syncop_getxattr (FIRST_CHILD(this), &loc, &dict,
-                               GF_XATTR_PATHINFO_KEY);
+                               GF_XATTR_PATHINFO_KEY, NULL);
         if (ret < 0) {
                 *op_errno = -ret;
                 ret = -1;
diff --git a/xlators/mount/fuse/src/fuse-bridge.c b/xlators/mount/fuse/src/fuse-bridge.c
index e61671829e1..cb345ad11f2 100644
--- a/xlators/mount/fuse/src/fuse-bridge.c
+++ b/xlators/mount/fuse/src/fuse-bridge.c
@@ -4319,7 +4319,7 @@ fuse_migrate_locks (xlator_t *this, fd_t *basefd, fd_t *oldfd,
         UNLOCK (&basefd->lock);
 
         ret = syncop_fgetxattr (old_subvol, oldfd, &lockinfo,
-                                GF_XATTR_LOCKINFO_KEY);
+                                GF_XATTR_LOCKINFO_KEY, NULL);
         if (ret < 0) {
                 gf_log (this->name, GF_LOG_WARNING,
 			"getting lockinfo failed while migrating locks"