summaryrefslogtreecommitdiffstats
path: root/xlators
diff options
context:
space:
mode:
Diffstat (limited to 'xlators')
-rw-r--r--xlators/features/locks/src/posix.c4
-rw-r--r--xlators/protocol/client/src/client-helpers.c4
-rw-r--r--xlators/protocol/server/src/server-helpers.c4
3 files changed, 12 insertions, 0 deletions
diff --git a/xlators/features/locks/src/posix.c b/xlators/features/locks/src/posix.c
index ed07dd4b1a4..f53af6345df 100644
--- a/xlators/features/locks/src/posix.c
+++ b/xlators/features/locks/src/posix.c
@@ -2708,6 +2708,8 @@ gf_mig_info_for_lock (posix_lock_t *lock)
posix_lock_to_flock (lock, &new->flock);
+ new->lk_flags = lock->lk_flags;
+
new->client_uid = gf_strdup (lock->client_uid);
out:
@@ -3385,6 +3387,8 @@ gf_lkmig_info_to_posix_lock (call_frame_t *frame,
lock->client = frame->root->client;
+ lock->lk_flags = lmi->lk_flags;
+
lock->client_uid = gf_strdup (lmi->client_uid);
if (lock->client_uid == NULL) {
GF_FREE (lock);
diff --git a/xlators/protocol/client/src/client-helpers.c b/xlators/protocol/client/src/client-helpers.c
index 351a10be6e6..4bdb364a9a3 100644
--- a/xlators/protocol/client/src/client-helpers.c
+++ b/xlators/protocol/client/src/client-helpers.c
@@ -1795,6 +1795,8 @@ clnt_unserialize_rsp_locklist (xlator_t *this, struct gfs3_getactivelk_rsp *rsp,
gf_proto_flock_to_flock (&trav->flock, &temp->flock);
+ temp->lk_flags = trav->lk_flags;
+
temp->client_uid = gf_strdup (trav->client_uid);
list_add_tail (&temp->list, &lmi->list);
@@ -1861,6 +1863,8 @@ serialize_req_locklist (lock_migration_info_t *locklist,
gf_proto_flock_from_flock (&trav->flock, &tmp->flock);
+ trav->lk_flags = tmp->lk_flags;
+
trav->client_uid = gf_strdup (tmp->client_uid);
if (!trav->client_uid) {
gf_msg (THIS->name, GF_LOG_ERROR, 0, 0,
diff --git a/xlators/protocol/server/src/server-helpers.c b/xlators/protocol/server/src/server-helpers.c
index 09183e8a1dd..39fbcbc6763 100644
--- a/xlators/protocol/server/src/server-helpers.c
+++ b/xlators/protocol/server/src/server-helpers.c
@@ -1025,6 +1025,8 @@ serialize_rsp_locklist (lock_migration_info_t *locklist,
gf_proto_flock_from_flock (&trav->flock, &tmp->flock);
+ trav->lk_flags = tmp->lk_flags;
+
trav->client_uid = tmp->client_uid;
if (prev)
@@ -1337,6 +1339,8 @@ unserialize_req_locklist (gfs3_setactivelk_req *req,
gf_proto_flock_to_flock (&trav->flock, &temp->flock);
+ temp->lk_flags = trav->lk_flags;
+
temp->client_uid = gf_strdup (trav->client_uid);
list_add_tail (&temp->list, &lmi->list);