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/dht/src | |
| 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/dht/src')
| -rw-r--r-- | xlators/cluster/dht/src/dht-helper.c | 8 | ||||
| -rw-r--r-- | xlators/cluster/dht/src/dht-rebalance.c | 4 |
2 files changed, 6 insertions, 6 deletions
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; |