From 83487d024bcfe671ef83752c8c3a8b56b8dcee2b Mon Sep 17 00:00:00 2001 From: Pavan Vilas Sondur Date: Thu, 3 Dec 2009 14:51:09 +0000 Subject: protocol/server: Changes in protocol client to include lk_owner in protocol header. Signed-off-by: Pavan Vilas Sondur Signed-off-by: Anand V. Avati BUG: 336 (Use lock owner field from fuse in locks) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=336 --- libglusterfs/src/protocol.h | 2 ++ libglusterfs/src/stack.h | 1 + 2 files changed, 3 insertions(+) (limited to 'libglusterfs') diff --git a/libglusterfs/src/protocol.h b/libglusterfs/src/protocol.h index 450e38731c2..3b5b3087f9f 100644 --- a/libglusterfs/src/protocol.h +++ b/libglusterfs/src/protocol.h @@ -977,6 +977,8 @@ typedef struct { * in gid. */ uint32_t groups[GF_REQUEST_MAXGROUPS]; + + uint64_t lk_owner; } __attribute__ ((packed)) gf_hdr_req_t; diff --git a/libglusterfs/src/stack.h b/libglusterfs/src/stack.h index 722651a4c9d..cad7f79bec2 100644 --- a/libglusterfs/src/stack.h +++ b/libglusterfs/src/stack.h @@ -266,6 +266,7 @@ copy_frame (call_frame_t *frame) newstack->frames.this = frame->this; newstack->frames.root = newstack; newstack->pool = oldstack->pool; + newstack->lk_owner = oldstack->lk_owner; LOCK_INIT (&newstack->frames.lock); -- cgit