summaryrefslogtreecommitdiffstats
path: root/libglusterfs
diff options
context:
space:
mode:
Diffstat (limited to 'libglusterfs')
-rw-r--r--libglusterfs/src/default-args.c4
-rw-r--r--libglusterfs/src/glusterfs.h1
-rw-r--r--libglusterfs/src/syncop.c2
3 files changed, 7 insertions, 0 deletions
diff --git a/libglusterfs/src/default-args.c b/libglusterfs/src/default-args.c
index 9f788011ecb..2e51bf21f84 100644
--- a/libglusterfs/src/default-args.c
+++ b/libglusterfs/src/default-args.c
@@ -1454,6 +1454,8 @@ args_getactivelk_cbk_store (default_args_cbk_t *args,
INIT_LIST_HEAD (&stub_entry->list);
stub_entry->flock = entry->flock;
+ stub_entry->lk_flags = entry->lk_flags;
+
stub_entry->client_uid = gf_strdup (entry->client_uid);
if (!stub_entry->client_uid) {
GF_FREE (stub_entry);
@@ -1490,6 +1492,8 @@ args_setactivelk_store (default_args_t *args, loc_t *loc,
INIT_LIST_HEAD (&stub_entry->list);
stub_entry->flock = entry->flock;
+ stub_entry->lk_flags = entry->lk_flags;
+
stub_entry->client_uid = gf_strdup (entry->client_uid);
if (!stub_entry->client_uid) {
GF_FREE (stub_entry);
diff --git a/libglusterfs/src/glusterfs.h b/libglusterfs/src/glusterfs.h
index 28d894fb8e1..e8a7b237690 100644
--- a/libglusterfs/src/glusterfs.h
+++ b/libglusterfs/src/glusterfs.h
@@ -509,6 +509,7 @@ typedef struct lock_migration_info {
struct list_head list;
struct gf_flock flock;
char *client_uid;
+ uint32_t lk_flags;
} lock_migration_info_t;
#define GF_MUST_CHECK __attribute__((warn_unused_result))
diff --git a/libglusterfs/src/syncop.c b/libglusterfs/src/syncop.c
index e3d48577d2c..00a9b576269 100644
--- a/libglusterfs/src/syncop.c
+++ b/libglusterfs/src/syncop.c
@@ -3101,6 +3101,8 @@ syncop_getactivelk_cbk (call_frame_t *frame,
entry->flock = tmp->flock;
+ entry->lk_flags = tmp->lk_flags;
+
entry->client_uid = gf_strdup (tmp->client_uid);
list_add_tail (&entry->list, &args->locklist.list);