summaryrefslogtreecommitdiffstats
path: root/xlators/protocol
diff options
context:
space:
mode:
authorAnand Avati <avati@gluster.com>2010-09-03 13:59:06 +0000
committerVijay Bellur <vijay@dev.gluster.com>2010-09-04 01:45:10 -0700
commitb304333f8686468b2d3b2c60e040b1667d8c38c9 (patch)
tree8923cfe294e7cb61745d7bf3aed9523c35332f20 /xlators/protocol
parentac60a2a7f3c7b07830669e282d9fc796cbc78f38 (diff)
gfid: change in create() prototype to have params dictionary with uuid in it
Signed-off-by: Anand V. Avati <avati@blackhole.gluster.com> Signed-off-by: Anand V. Avati <avati@amp.gluster.com> Signed-off-by: Vijay Bellur <vijay@dev.gluster.com> BUG: 971 (dynamic volume management) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=971
Diffstat (limited to 'xlators/protocol')
-rw-r--r--xlators/protocol/client/src/client.c2
-rw-r--r--xlators/protocol/legacy/client/src/client-protocol.c2
-rw-r--r--xlators/protocol/legacy/server/src/server-helpers.c5
-rw-r--r--xlators/protocol/legacy/server/src/server-protocol.c3
-rw-r--r--xlators/protocol/legacy/server/src/server-protocol.h1
-rw-r--r--xlators/protocol/server/src/server-helpers.c5
-rw-r--r--xlators/protocol/server/src/server.h1
-rw-r--r--xlators/protocol/server/src/server3_1-fops.c3
8 files changed, 18 insertions, 4 deletions
diff --git a/xlators/protocol/client/src/client.c b/xlators/protocol/client/src/client.c
index 02479607ece..98289b1d67e 100644
--- a/xlators/protocol/client/src/client.c
+++ b/xlators/protocol/client/src/client.c
@@ -559,7 +559,7 @@ out:
int32_t
client_create (call_frame_t *frame, xlator_t *this, loc_t *loc,
- int32_t flags, mode_t mode, fd_t *fd)
+ int32_t flags, mode_t mode, fd_t *fd, dict_t *params)
{
int ret = -1;
clnt_conf_t *conf = NULL;
diff --git a/xlators/protocol/legacy/client/src/client-protocol.c b/xlators/protocol/legacy/client/src/client-protocol.c
index 64f513bf43c..e688e0e56b2 100644
--- a/xlators/protocol/legacy/client/src/client-protocol.c
+++ b/xlators/protocol/legacy/client/src/client-protocol.c
@@ -685,7 +685,7 @@ protocol_client_xfer (call_frame_t *frame, xlator_t *this, transport_t *trans,
int
client_create (call_frame_t *frame, xlator_t *this, loc_t *loc, int32_t flags,
- mode_t mode, fd_t *fd)
+ mode_t mode, fd_t *fd, dict_t *params)
{
gf_hdr_common_t *hdr = NULL;
gf_fop_create_req_t *req = NULL;
diff --git a/xlators/protocol/legacy/server/src/server-helpers.c b/xlators/protocol/legacy/server/src/server-helpers.c
index 79104752ff1..08f89af5aba 100644
--- a/xlators/protocol/legacy/server/src/server-helpers.c
+++ b/xlators/protocol/legacy/server/src/server-helpers.c
@@ -86,6 +86,11 @@ free_old_server_state (server_state_t *state)
state->fd = NULL;
}
+ if (state->params) {
+ dict_unref (state->params);
+ state->params = NULL;
+ }
+
if (state->iobref) {
iobref_unref (state->iobref);
state->iobref = NULL;
diff --git a/xlators/protocol/legacy/server/src/server-protocol.c b/xlators/protocol/legacy/server/src/server-protocol.c
index 56acc59b791..1fbe86923a0 100644
--- a/xlators/protocol/legacy/server/src/server-protocol.c
+++ b/xlators/protocol/legacy/server/src/server-protocol.c
@@ -2885,7 +2885,8 @@ server_create_resume (call_frame_t *frame, xlator_t *bound_xl)
STACK_WIND (frame, server_create_cbk,
bound_xl, bound_xl->fops->create,
- &(state->loc), state->flags, state->mode, state->fd);
+ &(state->loc), state->flags, state->mode,
+ state->fd, state->params);
return 0;
err:
diff --git a/xlators/protocol/legacy/server/src/server-protocol.h b/xlators/protocol/legacy/server/src/server-protocol.h
index 56d23fdbfab..13691287132 100644
--- a/xlators/protocol/legacy/server/src/server-protocol.h
+++ b/xlators/protocol/legacy/server/src/server-protocol.h
@@ -163,6 +163,7 @@ struct _server_state {
int valid;
fd_t *fd;
+ dict_t *params;
int flags;
int wbflags;
struct iobuf *iobuf;
diff --git a/xlators/protocol/server/src/server-helpers.c b/xlators/protocol/server/src/server-helpers.c
index af1ba1a4eb8..eab8f571d93 100644
--- a/xlators/protocol/server/src/server-helpers.c
+++ b/xlators/protocol/server/src/server-helpers.c
@@ -105,6 +105,11 @@ free_state (server_state_t *state)
state->fd = NULL;
}
+ if (state->params) {
+ dict_unref (state->params);
+ state->params = NULL;
+ }
+
if (state->iobref) {
iobref_unref (state->iobref);
state->iobref = NULL;
diff --git a/xlators/protocol/server/src/server.h b/xlators/protocol/server/src/server.h
index b58e8a5fada..453eee57e1c 100644
--- a/xlators/protocol/server/src/server.h
+++ b/xlators/protocol/server/src/server.h
@@ -162,6 +162,7 @@ struct _server_state {
int valid;
fd_t *fd;
+ dict_t *params;
int flags;
int wbflags;
struct iovec payload_vector[MAX_IOVEC];
diff --git a/xlators/protocol/server/src/server3_1-fops.c b/xlators/protocol/server/src/server3_1-fops.c
index 7748ef81324..644b84a2072 100644
--- a/xlators/protocol/server/src/server3_1-fops.c
+++ b/xlators/protocol/server/src/server3_1-fops.c
@@ -2492,7 +2492,8 @@ server_create_resume (call_frame_t *frame, xlator_t *bound_xl)
STACK_WIND (frame, server_create_cbk,
bound_xl, bound_xl->fops->create,
- &(state->loc), state->flags, state->mode, state->fd);
+ &(state->loc), state->flags, state->mode,
+ state->fd, state->params);
return 0;
err: