summaryrefslogtreecommitdiffstats
path: root/libglusterfs/src/syncop.c
diff options
context:
space:
mode:
authorKrishnan P <kp@gluster.com>2011-06-16 01:26:00 +0000
committerAnand Avati <avati@gluster.com>2011-06-16 09:15:00 -0700
commit84fe7114833aed4efc31a1beaf7fcff0124c0ab4 (patch)
tree277b21d78de7e1ad48851eaaed89ae8c99593612 /libglusterfs/src/syncop.c
parent3f2c74a941f34b29dd92e4754d01ebea9db42218 (diff)
syncop: Modified to accept one 'non-frame' arg.
Earlier syncops used to accept one argument which was a call frame to carry out the fops synchronously. Now we have two args passed to synctask function, one call frame and another void pointer. Signed-off-by: Krishnan Parthasarathi <kp@gluster.com> Signed-off-by: Anand Avati <avati@gluster.com> BUG: 3033 (Changes to replace-brick and syntask interface.) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=3033
Diffstat (limited to 'libglusterfs/src/syncop.c')
-rw-r--r--libglusterfs/src/syncop.c45
1 files changed, 40 insertions, 5 deletions
diff --git a/libglusterfs/src/syncop.c b/libglusterfs/src/syncop.c
index 267e4b3..938fa35 100644
--- a/libglusterfs/src/syncop.c
+++ b/libglusterfs/src/syncop.c
@@ -28,12 +28,12 @@ call_frame_t *
syncop_create_frame ()
{
struct synctask *task = NULL;
- struct call_frame_t *frame = NULL;
+ call_frame_t *frame = NULL;
task = synctask_get ();
if (task) {
- frame = task->opaque;
+ frame = task->frame;
}
return (call_frame_t *)frame;
@@ -102,7 +102,7 @@ synctask_wrap (struct synctask *task)
int ret;
ret = task->syncfn (task->opaque);
- task->synccbk (ret, task->opaque);
+ task->synccbk (ret, task->frame, task->opaque);
/* cannot destroy @task right here as we are
in the execution stack of @task itself
@@ -128,19 +128,26 @@ synctask_destroy (struct synctask *task)
int
synctask_new (struct syncenv *env, synctask_fn_t fn, synctask_cbk_t cbk,
- void *opaque)
+ call_frame_t *frame, void *opaque)
{
struct synctask *newtask = NULL;
+ xlator_t *this = THIS;
+
+ VALIDATE_OR_GOTO (env, err);
+ VALIDATE_OR_GOTO (fn, err);
+ VALIDATE_OR_GOTO (cbk, err);
+ VALIDATE_OR_GOTO (frame, err);
newtask = CALLOC (1, sizeof (*newtask));
if (!newtask)
return -ENOMEM;
newtask->env = env;
- newtask->xl = THIS;
+ newtask->xl = this;
newtask->syncfn = fn;
newtask->synccbk = cbk;
newtask->opaque = opaque;
+ newtask->frame = frame;
INIT_LIST_HEAD (&newtask->all_tasks);
@@ -430,6 +437,34 @@ syncop_opendir (xlator_t *subvol,
int
+syncop_removexattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
+ int op_ret, int op_errno)
+{
+ struct syncargs *args = NULL;
+
+ args = cookie;
+
+ args->op_ret = op_ret;
+ args->op_errno = op_errno;
+
+ __wake (args);
+
+ return 0;
+}
+
+int
+syncop_removexattr (xlator_t *subvol, loc_t *loc, const char *name)
+{
+ struct syncargs args = {0, };
+
+ SYNCOP (subvol, (&args), syncop_removexattr_cbk, subvol->fops->removexattr,
+ loc, name);
+
+ errno = args.op_errno;
+ return args.op_ret;
+}
+
+int
syncop_setxattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
int op_ret, int op_errno)
{