summaryrefslogtreecommitdiffstats
path: root/xlators/features/marker
diff options
context:
space:
mode:
authorRaghavendra Talur <rtalur@redhat.com>2015-03-11 18:36:01 +0530
committerVijay Bellur <vbellur@redhat.com>2015-04-08 15:14:59 +0000
commit346e64e578573296028efa516cd93cfaf2b17b8f (patch)
tree5858b85260226377f23358fbd227e63d44abea5d /xlators/features/marker
parent4f0c068d8fe2654f205202e129e673aaa9342c63 (diff)
libglusterfs/syncop: Add xdata to all syncop calls
This patch adds support for xdata in both the request and response path of syncops. Few calls like lookup already had the support; have renamed variables in few places to maintain uniformity. xdata passed downwards is known as xdata_in and xdata passed upwards is known as xdata_out. There is an old patch by Jeff Darcy at http://review.gluster.org/#/c/8769/3 which does the same for some selected calls. It also brings in xdata support at gfapi level. xdata support at gfapi level would be introduced in subsequent patches. Change-Id: I340e94ebaf2a38e160e65bc30732e8fe1c532dcc BUG: 1158621 Signed-off-by: Raghavendra Talur <rtalur@redhat.com> Reviewed-on: http://review.gluster.org/9859 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Vijay Bellur <vbellur@redhat.com>
Diffstat (limited to 'xlators/features/marker')
-rw-r--r--xlators/features/marker/src/marker-quota.c28
-rw-r--r--xlators/features/marker/src/marker.c5
2 files changed, 17 insertions, 16 deletions
diff --git a/xlators/features/marker/src/marker-quota.c b/xlators/features/marker/src/marker-quota.c
index 2975e56..c6cf470 100644
--- a/xlators/features/marker/src/marker-quota.c
+++ b/xlators/features/marker/src/marker-quota.c
@@ -2100,8 +2100,8 @@ mq_are_xattrs_set (xlator_t *this, loc_t *loc, gf_boolean_t *result,
if (ret < 0)
goto out;
- ret = syncop_lookup (FIRST_CHILD(this), loc, dict, &stbuf, &rsp_dict,
- NULL);
+ ret = syncop_lookup (FIRST_CHILD(this), loc, &stbuf, NULL,
+ dict, &rsp_dict);
if (ret < 0) {
gf_log (this->name, (-ret == ENOENT || -ret == ESTALE)
? GF_LOG_DEBUG:GF_LOG_ERROR, "lookup failed "
@@ -2198,7 +2198,7 @@ mq_create_xattrs (xlator_t *this, loc_t *loc, gf_boolean_t objects)
}
ret = syncop_xattrop(FIRST_CHILD(this), loc, GF_XATTROP_ADD_ARRAY64,
- dict, NULL);
+ dict, NULL, NULL);
if (ret < 0) {
gf_log (this->name, (-ret == ENOENT || -ret == ESTALE)
@@ -2264,8 +2264,8 @@ mq_get_dirty (xlator_t *this, loc_t *loc, int32_t *dirty)
goto out;
}
- ret = syncop_lookup (FIRST_CHILD(this), loc, dict, &stbuf, &rsp_dict,
- NULL);
+ ret = syncop_lookup (FIRST_CHILD(this), loc, &stbuf, NULL,
+ dict, &rsp_dict);
if (ret < 0) {
gf_log (this->name, (-ret == ENOENT || -ret == ESTALE)
? GF_LOG_DEBUG:GF_LOG_ERROR, "lookup failed "
@@ -2311,7 +2311,7 @@ mq_mark_dirty (xlator_t *this, loc_t *loc, int32_t dirty)
goto out;
}
- ret = syncop_setxattr (FIRST_CHILD(this), loc, dict, 0);
+ ret = syncop_setxattr (FIRST_CHILD(this), loc, dict, 0, NULL, NULL);
if (ret < 0) {
gf_log (this->name, (-ret == ENOENT || -ret == ESTALE)
? GF_LOG_DEBUG:GF_LOG_ERROR, "setxattr dirty = %d "
@@ -2377,8 +2377,8 @@ _mq_get_metadata (xlator_t *this, loc_t *loc, quota_meta_t *contri,
goto out;
}
- ret = syncop_lookup (FIRST_CHILD(this), loc, dict, &stbuf, &rsp_dict,
- NULL);
+ ret = syncop_lookup (FIRST_CHILD(this), loc, &stbuf, NULL,
+ dict, &rsp_dict);
if (ret < 0) {
gf_log (this->name, (-ret == ENOENT || -ret == ESTALE)
? GF_LOG_DEBUG:GF_LOG_ERROR, "lookup failed "
@@ -2548,7 +2548,7 @@ mq_remove_contri (xlator_t *this, loc_t *loc, inode_contribution_t *contri)
goto out;
}
- ret = syncop_removexattr (FIRST_CHILD(this), loc, contri_key, 0);
+ ret = syncop_removexattr (FIRST_CHILD(this), loc, contri_key, 0, NULL);
if (ret < 0) {
if (-ret == ENOENT || -ret == ESTALE) {
/* Remove contri in done when unlink operation is
@@ -2615,7 +2615,7 @@ mq_update_contri (xlator_t *this, loc_t *loc, inode_contribution_t *contri,
goto out;
ret = syncop_xattrop(FIRST_CHILD(this), loc, GF_XATTROP_ADD_ARRAY64,
- dict, NULL);
+ dict, NULL, NULL);
if (ret < 0) {
gf_log (this->name, (-ret == ENOENT || -ret == ESTALE)
? GF_LOG_DEBUG:GF_LOG_ERROR, "xattrop failed "
@@ -2674,7 +2674,7 @@ mq_update_size (xlator_t *this, loc_t *loc, quota_meta_t *delta)
goto out;
ret = syncop_xattrop(FIRST_CHILD(this), loc, GF_XATTROP_ADD_ARRAY64,
- dict, NULL);
+ dict, NULL, NULL);
if (ret < 0) {
gf_log (this->name, (-ret == ENOENT || -ret == ESTALE)
? GF_LOG_DEBUG:GF_LOG_ERROR, "xattrop failed "
@@ -3256,7 +3256,7 @@ mq_update_dirty_inode_v2 (xlator_t *this, loc_t *loc, quota_inode_ctx_t *ctx,
goto out;
}
- ret = syncop_opendir (this, loc, fd);
+ ret = syncop_opendir (this, loc, fd, NULL, NULL);
if (ret < 0) {
gf_log (this->name, (-ret == ENOENT || -ret == ESTALE)
? GF_LOG_DEBUG:GF_LOG_ERROR, "opendir failed "
@@ -3265,8 +3265,8 @@ mq_update_dirty_inode_v2 (xlator_t *this, loc_t *loc, quota_inode_ctx_t *ctx,
}
INIT_LIST_HEAD (&entries.list);
- while ((ret = syncop_readdirp (this, fd, 131072, offset, NULL,
- &entries)) != 0) {
+ while ((ret = syncop_readdirp (this, fd, 131072, offset, &entries,
+ NULL, NULL)) != 0) {
if (ret < 0) {
gf_log (this->name, (-ret == ENOENT || -ret == ESTALE)
? GF_LOG_DEBUG:GF_LOG_ERROR, "readdirp failed "
diff --git a/xlators/features/marker/src/marker.c b/xlators/features/marker/src/marker.c
index b1eb252..fe7c634 100644
--- a/xlators/features/marker/src/marker.c
+++ b/xlators/features/marker/src/marker.c
@@ -2197,7 +2197,7 @@ remove_quota_keys (dict_t *dict, char *k, data_t *v, void *data)
xlator_t *this = frame->this;
int ret = -1;
- ret = syncop_removexattr (FIRST_CHILD (this), &local->loc, k, 0);
+ ret = syncop_removexattr (FIRST_CHILD (this), &local->loc, k, 0, NULL);
if (ret) {
gf_log (this->name, GF_LOG_ERROR, "%s: Failed to remove "
"extended attribute: %s", local->loc.path, k);
@@ -2243,7 +2243,8 @@ quota_xattr_cleaner (void *args)
this = frame->this;
local = frame->local;
- ret = syncop_listxattr (FIRST_CHILD(this), &local->loc, &xdata);
+ ret = syncop_listxattr (FIRST_CHILD(this), &local->loc, &xdata, NULL,
+ NULL);
if (ret == -1) {
ret = -errno;
goto out;