summaryrefslogtreecommitdiffstats
path: root/rpc/xdr/src/glusterfs3-xdr.c
diff options
context:
space:
mode:
authorPavan Sondur <pavan@gluster.com>2010-10-01 05:45:12 +0000
committerVijay Bellur <vijay@dev.gluster.com>2010-10-01 05:05:53 -0700
commitfd2e7d007e5362f0738cd9a825349abcf5d27d8f (patch)
treed86cd9b0162cd43cb6d1e573b24f6c49a5e353f4 /rpc/xdr/src/glusterfs3-xdr.c
parent55c6e672503a2451186e17b9c1b7daf6e3ae5463 (diff)
Changes to replace flock with gf_flock across GlusterFS.
Signed-off-by: Pavan Vilas Sondur <pavan@gluster.com> Signed-off-by: Vijay Bellur <vijay@dev.gluster.com> BUG: 865 (Add locks recovery support in GlusterFS) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=865
Diffstat (limited to 'rpc/xdr/src/glusterfs3-xdr.c')
-rw-r--r--rpc/xdr/src/glusterfs3-xdr.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/rpc/xdr/src/glusterfs3-xdr.c b/rpc/xdr/src/glusterfs3-xdr.c
index 3792d28d255..a6ebf5cf3b0 100644
--- a/rpc/xdr/src/glusterfs3-xdr.c
+++ b/rpc/xdr/src/glusterfs3-xdr.c
@@ -55,7 +55,7 @@ xdr_gf_statfs (XDR *xdrs, gf_statfs *objp)
}
bool_t
-xdr_gf_flock (XDR *xdrs, gf_flock *objp)
+xdr_gf_proto_flock (XDR *xdrs, gf_proto_flock *objp)
{
if (!xdr_u_int (xdrs, &objp->type))
@@ -68,6 +68,8 @@ xdr_gf_flock (XDR *xdrs, gf_flock *objp)
return FALSE;
if (!xdr_u_int (xdrs, &objp->pid))
return FALSE;
+ if (!xdr_u_quad_t (xdrs, &objp->owner))
+ return FALSE;
return TRUE;
}
@@ -705,7 +707,7 @@ xdr_gfs3_lk_req (XDR *xdrs, gfs3_lk_req *objp)
return FALSE;
if (!xdr_u_int (xdrs, &objp->type))
return FALSE;
- if (!xdr_gf_flock (xdrs, &objp->flock))
+ if (!xdr_gf_proto_flock (xdrs, &objp->flock))
return FALSE;
return TRUE;
}
@@ -718,7 +720,7 @@ xdr_gfs3_lk_rsp (XDR *xdrs, gfs3_lk_rsp *objp)
return FALSE;
if (!xdr_int (xdrs, &objp->op_errno))
return FALSE;
- if (!xdr_gf_flock (xdrs, &objp->flock))
+ if (!xdr_gf_proto_flock (xdrs, &objp->flock))
return FALSE;
return TRUE;
}
@@ -733,7 +735,7 @@ xdr_gfs3_inodelk_req (XDR *xdrs, gfs3_inodelk_req *objp)
return FALSE;
if (!xdr_u_int (xdrs, &objp->type))
return FALSE;
- if (!xdr_gf_flock (xdrs, &objp->flock))
+ if (!xdr_gf_proto_flock (xdrs, &objp->flock))
return FALSE;
if (!xdr_string (xdrs, &objp->path, ~0))
return FALSE;
@@ -754,7 +756,7 @@ xdr_gfs3_finodelk_req (XDR *xdrs, gfs3_finodelk_req *objp)
return FALSE;
if (!xdr_u_int (xdrs, &objp->type))
return FALSE;
- if (!xdr_gf_flock (xdrs, &objp->flock))
+ if (!xdr_gf_proto_flock (xdrs, &objp->flock))
return FALSE;
if (!xdr_string (xdrs, &objp->volume, ~0))
return FALSE;