diff options
| author | Ravishankar N <ravishankar@redhat.com> | 2015-01-01 15:16:41 +0000 |
|---|---|---|
| committer | Vijay Bellur <vbellur@redhat.com> | 2015-01-05 22:00:09 -0800 |
| commit | c4ab37c02e9edc23d0637e23d6f2b42d0827dad2 (patch) | |
| tree | 0dc06a6b8288ff8f33b47ad7d98ee4daffe74af4 /xlators/cluster/afr | |
| parent | b8e3b91b8180dcc5e9f8bb62734832ace69ad143 (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 'xlators/cluster/afr')
| -rw-r--r-- | xlators/cluster/afr/src/afr-self-heal-metadata.c | 6 | ||||
| -rw-r--r-- | xlators/cluster/afr/src/afr-self-heald.c | 8 |
2 files changed, 8 insertions, 6 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; |