3 files changed, 82 insertions, 0 deletions

diff --git a/rpc/rpc-lib/src/protocol-common.h b/rpc/rpc-lib/src/protocol-common.h
index cf98152dc8d..e711f33b00f 100644
--- a/rpc/rpc-lib/src/protocol-common.h
+++ b/rpc/rpc-lib/src/protocol-common.h
@@ -62,6 +62,7 @@ enum gf_fop_procnum {
         GFS3_OP_IPC,
         GFS3_OP_SEEK,
         GFS3_OP_COMPOUND,
+        GFS3_OP_LEASE,
         GFS3_OP_MAXVALUE,
 } ;
 
@@ -137,6 +138,7 @@ enum gf_cbk_procnum {
         GF_CBK_CACHE_INVALIDATION,
         GF_CBK_CHILD_UP,
         GF_CBK_CHILD_DOWN,
+        GF_CBK_RECALL_LEASE,
         GF_CBK_MAXVALUE,
 };
 
diff --git a/rpc/xdr/src/glusterfs3-xdr.x b/rpc/xdr/src/glusterfs3-xdr.x
index 87194e07ac9..99e88fbffdf 100644
--- a/rpc/xdr/src/glusterfs3-xdr.x
+++ b/rpc/xdr/src/glusterfs3-xdr.x
@@ -26,6 +26,12 @@ struct gf_proto_flock {
         opaque         lk_owner<>;
 } ;
 
+struct gf_proto_lease {
+        unsigned int   cmd;
+        unsigned int   lease_type;
+        opaque         lease_id[16];
+        unsigned int   lease_flags;
+} ;
 
 struct gf_iatt {
         opaque             ia_gfid[16];
@@ -308,6 +314,24 @@ struct   gfs3_lookup_req {
         opaque   xdata<>; /* Extra data */
 }  ;
 
+struct gfs3_lease_req {
+        opaque gfid[16];
+        struct gf_proto_lease lease;
+        opaque   xdata<>; /* Extra data */
+}  ;
+
+struct gfs3_lease_rsp {
+        int    op_ret;
+        int    op_errno;
+        struct gf_proto_lease lease;
+        opaque   xdata<>; /* Extra data */
+}  ;
+
+struct gfs3_recall_lease_req {
+        opaque       gfid[16];
+        unsigned int lease_type;
+}  ;
+
  struct gfs3_inodelk_req {
         opaque gfid[16];
 	unsigned int cmd;
diff --git a/rpc/xdr/src/glusterfs3.h b/rpc/xdr/src/glusterfs3.h
index e50bd9e6c59..b1d43f95e87 100644
--- a/rpc/xdr/src/glusterfs3.h
+++ b/rpc/xdr/src/glusterfs3.h
@@ -183,6 +183,62 @@ gf_statfs_from_statfs (struct gf_statfs *gf_stat, struct statvfs *stat)
 }
 
 static inline void
+gf_proto_lease_to_lease (struct gf_proto_lease *gf_proto_lease, struct gf_lease *gf_lease)
+{
+        if (!gf_lease || !gf_proto_lease)
+                return;
+
+        gf_lease->cmd        = gf_proto_lease->cmd;
+        gf_lease->lease_type = gf_proto_lease->lease_type;
+        memcpy (gf_lease->lease_id, gf_proto_lease->lease_id, LEASE_ID_SIZE);
+}
+
+static inline void
+gf_proto_lease_from_lease (struct gf_proto_lease *gf_proto_lease, struct gf_lease *gf_lease)
+{
+        if (!gf_lease || !gf_proto_lease)
+                return;
+
+        gf_proto_lease->cmd  = gf_lease->cmd;
+        gf_proto_lease->lease_type = gf_lease->lease_type;
+        memcpy (gf_proto_lease->lease_id, gf_lease->lease_id, LEASE_ID_SIZE);
+}
+
+static inline void
+gf_proto_recall_lease_to_upcall (struct gfs3_recall_lease_req *recall_lease,
+                                 struct gf_upcall *gf_up_data)
+{
+        struct gf_upcall_recall_lease *tmp = NULL;
+
+        GF_VALIDATE_OR_GOTO(THIS->name, recall_lease, out);
+        GF_VALIDATE_OR_GOTO(THIS->name, gf_up_data, out);
+
+        tmp = (struct gf_upcall_recall_lease *)gf_up_data->data;
+        tmp->lease_type = recall_lease->lease_type;
+        memcpy (gf_up_data->gfid, recall_lease->gfid, 16);
+out:
+        return;
+
+}
+
+static inline void
+gf_proto_recall_lease_from_upcall (struct gfs3_recall_lease_req *recall_lease,
+                                   struct gf_upcall *gf_up_data)
+{
+        struct gf_upcall_recall_lease *tmp = NULL;
+
+        GF_VALIDATE_OR_GOTO(THIS->name, recall_lease, out);
+        GF_VALIDATE_OR_GOTO(THIS->name, gf_up_data, out);
+
+        tmp = (struct gf_upcall_recall_lease *)gf_up_data->data;
+        recall_lease->lease_type = tmp->lease_type;
+        memcpy (recall_lease->gfid, gf_up_data->gfid, 16);
+out:
+        return;
+
+}
+
+static inline void
 gf_proto_flock_to_flock (struct gf_proto_flock *gf_proto_flock, struct gf_flock *gf_flock)
 {
         if (!gf_flock || !gf_proto_flock)