summaryrefslogtreecommitdiffstats
path: root/xlators
diff options
context:
space:
mode:
authorAshish Pandey <aspandey@redhat.com>2018-04-25 16:48:56 +0530
committerXavi Hernandez <xhernandez@redhat.com>2018-05-03 07:16:21 +0000
commit112048652ab00d9650053396c1b28a49d1853783 (patch)
tree057218aa883d970a5a30bd3e74a523a0c6444f61 /xlators
parent11b747bcec316aad77c68451346e092f33b2f218 (diff)
protocol/server : unwind as per op version
Change-Id: Id6717640ac14881b490e512c4682e45ffffa7f5b fixes: bz#1570538 BUG: 1570538 Signed-off-by: Ashish Pandey <aspandey@redhat.com>
Diffstat (limited to 'xlators')
-rw-r--r--xlators/features/locks/src/posix.c8
-rw-r--r--xlators/protocol/server/src/server-handshake.c5
2 files changed, 10 insertions, 3 deletions
diff --git a/xlators/features/locks/src/posix.c b/xlators/features/locks/src/posix.c
index 1e1d9e5ae30..57753dac588 100644
--- a/xlators/features/locks/src/posix.c
+++ b/xlators/features/locks/src/posix.c
@@ -1562,7 +1562,13 @@ int
pl_flush_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
int32_t op_ret, int32_t op_errno, dict_t *xdata)
{
- PL_STACK_UNWIND (flush, xdata, frame, op_ret, op_errno, xdata);
+
+ if (frame->root->client &&
+ (frame->root->client->opversion < GD_OP_VERSION_3_10_0)) {
+ STACK_UNWIND_STRICT (flush, frame, op_ret, op_errno, xdata);
+ } else {
+ PL_STACK_UNWIND (flush, xdata, frame, op_ret, op_errno, xdata);
+ }
return 0;
}
diff --git a/xlators/protocol/server/src/server-handshake.c b/xlators/protocol/server/src/server-handshake.c
index af63a0f15d9..ca167ce2dfa 100644
--- a/xlators/protocol/server/src/server-handshake.c
+++ b/xlators/protocol/server/src/server-handshake.c
@@ -747,11 +747,12 @@ server_setvolume (rpcsvc_request_t *req)
}
ret = dict_get_uint32 (params, "opversion", &opversion);
- if (ret)
+ if (ret) {
gf_msg (this->name, GF_LOG_INFO, 0,
PS_MSG_CLIENT_OPVERSION_GET_FAILED,
"Failed to get client opversion");
-
+ }
+ client->opversion = opversion;
/* Assign op-version value to the client */
pthread_mutex_lock (&conf->mutex);
list_for_each_entry (xprt, &conf->xprt_list, list) {