summaryrefslogtreecommitdiffstats
path: root/libglusterfs
diff options
context:
space:
mode:
authorPavan Vilas Sondur <pavan@gluster.com>2009-12-03 14:51:09 +0000
committerAnand V. Avati <avati@dev.gluster.com>2009-12-03 12:45:07 -0800
commit83487d024bcfe671ef83752c8c3a8b56b8dcee2b (patch)
tree34f5138c1cf07d46c8b61b38e32131ec17ddb27d /libglusterfs
parent687311adfd08f55de5f70cc89d69c5da0f37a80f (diff)
protocol/server: Changes in protocol client to include lk_owner in protocol header.
Signed-off-by: Pavan Vilas Sondur <pavan@gluster.com> Signed-off-by: Anand V. Avati <avati@dev.gluster.com> BUG: 336 (Use lock owner field from fuse in locks) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=336
Diffstat (limited to 'libglusterfs')
-rw-r--r--libglusterfs/src/protocol.h2
-rw-r--r--libglusterfs/src/stack.h1
2 files changed, 3 insertions, 0 deletions
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);