diff options
Diffstat (limited to 'xlators/protocol/lib/src')
| -rw-r--r-- | xlators/protocol/lib/src/glusterfs-xdr.c | 33 | ||||
| -rw-r--r-- | xlators/protocol/lib/src/glusterfs-xdr.h | 27 | ||||
| -rw-r--r-- | xlators/protocol/lib/src/glusterfs3.x | 15 | ||||
| -rw-r--r-- | xlators/protocol/lib/src/msg-xdr.c | 28 | ||||
| -rw-r--r-- | xlators/protocol/lib/src/msg-xdr.h | 11 | ||||
| -rw-r--r-- | xlators/protocol/lib/src/protocol-common.h | 1 |
6 files changed, 0 insertions, 115 deletions
diff --git a/xlators/protocol/lib/src/glusterfs-xdr.c b/xlators/protocol/lib/src/glusterfs-xdr.c index e8a254094f9..cbc4d7cef47 100644 --- a/xlators/protocol/lib/src/glusterfs-xdr.c +++ b/xlators/protocol/lib/src/glusterfs-xdr.c @@ -1365,39 +1365,6 @@ xdr_gfs3_fentrylk_req (XDR *xdrs, gfs3_fentrylk_req *objp) return TRUE; } -bool_t -xdr_gfs3_checksum_req (XDR *xdrs, gfs3_checksum_req *objp) -{ - - if (!xdr_u_quad_t (xdrs, &objp->gfs_id)) - return FALSE; - if (!xdr_u_quad_t (xdrs, &objp->ino)) - return FALSE; - if (!xdr_u_quad_t (xdrs, &objp->gen)) - return FALSE; - if (!xdr_u_int (xdrs, &objp->flag)) - return FALSE; - if (!xdr_string (xdrs, &objp->path, ~0)) - return FALSE; - return TRUE; -} - -bool_t -xdr_gfs3_checksum_rsp (XDR *xdrs, gfs3_checksum_rsp *objp) -{ - - if (!xdr_u_quad_t (xdrs, &objp->gfs_id)) - return FALSE; - if (!xdr_int (xdrs, &objp->op_ret)) - return FALSE; - if (!xdr_int (xdrs, &objp->op_errno)) - return FALSE; - if (!xdr_bytes (xdrs, (char **)&objp->fchecksum.fchecksum_val, (u_int *) &objp->fchecksum.fchecksum_len, ~0)) - return FALSE; - if (!xdr_bytes (xdrs, (char **)&objp->dchecksum.dchecksum_val, (u_int *) &objp->dchecksum.dchecksum_len, ~0)) - return FALSE; - return TRUE; -} bool_t xdr_gfs3_setattr_req (XDR *xdrs, gfs3_setattr_req *objp) diff --git a/xlators/protocol/lib/src/glusterfs-xdr.h b/xlators/protocol/lib/src/glusterfs-xdr.h index 72f131c746c..45ce3ff9bed 100644 --- a/xlators/protocol/lib/src/glusterfs-xdr.h +++ b/xlators/protocol/lib/src/glusterfs-xdr.h @@ -943,29 +943,6 @@ struct gfs3_fentrylk_req { }; typedef struct gfs3_fentrylk_req gfs3_fentrylk_req; -struct gfs3_checksum_req { - u_quad_t gfs_id; - u_quad_t ino; - u_quad_t gen; - u_int flag; - char *path; -}; -typedef struct gfs3_checksum_req gfs3_checksum_req; - -struct gfs3_checksum_rsp { - u_quad_t gfs_id; - int op_ret; - int op_errno; - struct { - u_int fchecksum_len; - char *fchecksum_val; - } fchecksum; - struct { - u_int dchecksum_len; - char *dchecksum_val; - } dchecksum; -}; -typedef struct gfs3_checksum_rsp gfs3_checksum_rsp; struct gfs3_setattr_req { u_quad_t gfs_id; @@ -1217,8 +1194,6 @@ extern bool_t xdr_gfs3_fstat_req (XDR *, gfs3_fstat_req*); extern bool_t xdr_gfs3_fstat_rsp (XDR *, gfs3_fstat_rsp*); extern bool_t xdr_gfs3_entrylk_req (XDR *, gfs3_entrylk_req*); extern bool_t xdr_gfs3_fentrylk_req (XDR *, gfs3_fentrylk_req*); -extern bool_t xdr_gfs3_checksum_req (XDR *, gfs3_checksum_req*); -extern bool_t xdr_gfs3_checksum_rsp (XDR *, gfs3_checksum_rsp*); extern bool_t xdr_gfs3_setattr_req (XDR *, gfs3_setattr_req*); extern bool_t xdr_gfs3_setattr_rsp (XDR *, gfs3_setattr_rsp*); extern bool_t xdr_gfs3_fsetattr_req (XDR *, gfs3_fsetattr_req*); @@ -1308,8 +1283,6 @@ extern bool_t xdr_gfs3_fstat_req (); extern bool_t xdr_gfs3_fstat_rsp (); extern bool_t xdr_gfs3_entrylk_req (); extern bool_t xdr_gfs3_fentrylk_req (); -extern bool_t xdr_gfs3_checksum_req (); -extern bool_t xdr_gfs3_checksum_rsp (); extern bool_t xdr_gfs3_setattr_req (); extern bool_t xdr_gfs3_setattr_rsp (); extern bool_t xdr_gfs3_fsetattr_req (); diff --git a/xlators/protocol/lib/src/glusterfs3.x b/xlators/protocol/lib/src/glusterfs3.x index c9510527c27..b2eb9556c02 100644 --- a/xlators/protocol/lib/src/glusterfs3.x +++ b/xlators/protocol/lib/src/glusterfs3.x @@ -634,21 +634,6 @@ struct gfs3_fstat_req { }; -struct gfs3_checksum_req { - unsigned hyper gfs_id; - unsigned hyper ino; - unsigned hyper gen; - unsigned int flag; - string path<>; -}; - struct gfs3_checksum_rsp { - unsigned hyper gfs_id; - int op_ret; - int op_errno; - opaque fchecksum<>; - opaque dchecksum<>; -} ; - struct gfs3_setattr_req { unsigned hyper gfs_id; unsigned hyper ino; diff --git a/xlators/protocol/lib/src/msg-xdr.c b/xlators/protocol/lib/src/msg-xdr.c index 8cab3726c3d..3fe5ad5f65d 100644 --- a/xlators/protocol/lib/src/msg-xdr.c +++ b/xlators/protocol/lib/src/msg-xdr.c @@ -333,13 +333,6 @@ xdr_serialize_opendir_rsp (struct iovec outmsg, void *rsp) } ssize_t -xdr_serialize_checksum_rsp (struct iovec outmsg, void *rsp) -{ - return xdr_serialize_generic (outmsg, (void *)rsp, - (xdrproc_t)xdr_gfs3_checksum_rsp); -} - -ssize_t xdr_serialize_ftruncate_rsp (struct iovec outmsg, void *rsp) { return xdr_serialize_generic (outmsg, (void *)rsp, @@ -579,13 +572,6 @@ xdr_to_fstat_req (struct iovec inmsg, void *args) return xdr_to_generic (inmsg, (void *)args, (xdrproc_t)xdr_gfs3_fstat_req); } - -ssize_t -xdr_to_checksum_req (struct iovec inmsg, void *args) -{ - return xdr_to_generic (inmsg, (void *)args, - (xdrproc_t)xdr_gfs3_checksum_req); -} ssize_t xdr_to_rchecksum_req (struct iovec inmsg, void *args) { @@ -953,13 +939,6 @@ xdr_from_statfs_req (struct iovec outmsg, void *req) } ssize_t -xdr_from_checksum_req (struct iovec outmsg, void *req) -{ - return xdr_serialize_generic (outmsg, (void *)req, - (xdrproc_t)xdr_gfs3_checksum_req); - -} -ssize_t xdr_from_rchecksum_req (struct iovec outmsg, void *req) { return xdr_serialize_generic (outmsg, (void *)req, @@ -1207,13 +1186,6 @@ xdr_to_statfs_rsp (struct iovec outmsg, void *rsp) } ssize_t -xdr_to_checksum_rsp (struct iovec outmsg, void *rsp) -{ - return xdr_to_generic (outmsg, (void *)rsp, - (xdrproc_t)xdr_gfs3_checksum_rsp); - -} -ssize_t xdr_to_rchecksum_rsp (struct iovec outmsg, void *rsp) { return xdr_to_generic (outmsg, (void *)rsp, diff --git a/xlators/protocol/lib/src/msg-xdr.h b/xlators/protocol/lib/src/msg-xdr.h index 872d9401e48..59b6ca30112 100644 --- a/xlators/protocol/lib/src/msg-xdr.h +++ b/xlators/protocol/lib/src/msg-xdr.h @@ -93,9 +93,6 @@ ssize_t xdr_serialize_ftruncate_rsp (struct iovec outmsg, void *rsp); ssize_t -xdr_serialize_checksum_rsp (struct iovec outmsg, void *rsp); - -ssize_t xdr_serialize_statfs_rsp (struct iovec outmsg, void *rsp); @@ -266,9 +263,6 @@ ssize_t xdr_to_rmdir_req (struct iovec inmsg, void *args); ssize_t -xdr_to_checksum_req (struct iovec inmsg, void *args); - -ssize_t xdr_to_rchecksum_req (struct iovec inmsg, void *args); ssize_t @@ -369,9 +363,6 @@ ssize_t xdr_from_fxattrop_req (struct iovec outmsg, void *args); ssize_t -xdr_from_checksum_req (struct iovec outmsg, void *args); - -ssize_t xdr_from_rchecksum_req (struct iovec outmsg, void *args); ssize_t @@ -515,8 +506,6 @@ ssize_t xdr_to_fgetxattr_rsp (struct iovec inmsg, void *args); ssize_t -xdr_to_checksum_rsp (struct iovec inmsg, void *args); -ssize_t xdr_to_rchecksum_rsp (struct iovec inmsg, void *args); ssize_t diff --git a/xlators/protocol/lib/src/protocol-common.h b/xlators/protocol/lib/src/protocol-common.h index 5378d90ba45..5590960a6d9 100644 --- a/xlators/protocol/lib/src/protocol-common.h +++ b/xlators/protocol/lib/src/protocol-common.h @@ -54,7 +54,6 @@ enum gf_fop_procnum { GFS3_OP_FINODELK, GFS3_OP_ENTRYLK, GFS3_OP_FENTRYLK, - GFS3_OP_CHECKSUM, GFS3_OP_XATTROP, GFS3_OP_FXATTROP, GFS3_OP_FGETXATTR, |