From 90717586363520bbb68e2ec4a7aa12272effa64e Mon Sep 17 00:00:00 2001 From: Amar Tumballi Date: Tue, 6 Jul 2010 07:12:11 +0000 Subject: removed 'fop->checksum' from codebase as its not required anymore Signed-off-by: Amar Tumballi Signed-off-by: Anand V. Avati BUG: 734 (keep only the working/usable code in build tree to focus more on development) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=734 --- xlators/protocol/client/src/client.c | 29 ---------- xlators/protocol/client/src/client3_1-fops.c | 85 ---------------------------- 2 files changed, 114 deletions(-) (limited to 'xlators/protocol/client/src') diff --git a/xlators/protocol/client/src/client.c b/xlators/protocol/client/src/client.c index bad814a81..6ad594400 100644 --- a/xlators/protocol/client/src/client.c +++ b/xlators/protocol/client/src/client.c @@ -1168,34 +1168,6 @@ out: } -int32_t -client_checksum (call_frame_t *frame, xlator_t *this, loc_t *loc, - int32_t flag) -{ - int ret = -1; - clnt_conf_t *conf = NULL; - rpc_clnt_procedure_t *proc = NULL; - clnt_args_t args = {0,}; - - conf = this->private; - if (!conf->fops) - goto out; - - args.loc = loc; - args.flags = flag; - - proc = &conf->fops->proctable[GF_FOP_CHECKSUM]; - if (proc->fn) - ret = proc->fn (frame, this, &args); -out: - if (ret) - STACK_UNWIND_STRICT (checksum, frame, -1, ENOTCONN, NULL, NULL); - - return 0; -} - - - int32_t client_rchecksum (call_frame_t *frame, xlator_t *this, fd_t *fd, off_t offset, int32_t len) @@ -1741,7 +1713,6 @@ struct xlator_fops fops = { .entrylk = client_entrylk, .fentrylk = client_fentrylk, .lookup = client_lookup, - .checksum = client_checksum, .rchecksum = client_rchecksum, .xattrop = client_xattrop, .fxattrop = client_fxattrop, diff --git a/xlators/protocol/client/src/client3_1-fops.c b/xlators/protocol/client/src/client3_1-fops.c index 5204ef032..07145a097 100644 --- a/xlators/protocol/client/src/client3_1-fops.c +++ b/xlators/protocol/client/src/client3_1-fops.c @@ -1548,47 +1548,6 @@ out: return 0; } -int -client3_1_checksum_cbk (struct rpc_req *req, struct iovec *iov, int count, - void *myframe) -{ - call_frame_t *frame = NULL; - gfs3_checksum_rsp rsp = {0,}; - int ret = 0; - - frame = myframe; - - if (-1 == req->rpc_status) { - rsp.op_ret = -1; - rsp.op_errno = ENOTCONN; - goto out; - } - - ret = xdr_to_checksum_rsp (*iov, &rsp); - if (ret < 0) { - gf_log ("", GF_LOG_ERROR, "error"); - rsp.op_ret = -1; - rsp.op_errno = EINVAL; - goto out; - } - -out: - STACK_UNWIND_STRICT (checksum, frame, rsp.op_ret, - gf_error_to_errno (rsp.op_errno), - (uint8_t *)rsp.fchecksum.fchecksum_val, - (uint8_t *)rsp.dchecksum.dchecksum_val); - - /* This is allocated by the libc while decoding RPC msg */ - /* Hence no 'GF_FREE', but just 'free' */ - if (rsp.fchecksum.fchecksum_val) { - free (rsp.fchecksum.fchecksum_val); - } - if (rsp.dchecksum.dchecksum_val) { - free (rsp.dchecksum.dchecksum_val); - } - return 0; -} - int client3_1_lk_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) @@ -4421,48 +4380,6 @@ unwind: } - - -int32_t -client3_1_checksum (call_frame_t *frame, xlator_t *this, - void *data) -{ - clnt_conf_t *conf = NULL; - clnt_args_t *args = NULL; - gfs3_checksum_req req = {0,}; - int ret = 0; - int op_errno = ESTALE; - - if (!frame || !this || !data) - goto unwind; - - args = data; - - ret = inode_ctx_get2 (args->loc->inode, this, &req.ino, &req.gen); - if (args->loc->inode->ino && ret < 0) { - gf_log (this->name, GF_LOG_TRACE, - "STAT %"PRId64" (%s): " - "failed to get remote inode number", - args->loc->inode->ino, args->loc->path); - goto unwind; - } - req.path = (char *)args->loc->path; - req.flag = args->flags; - req.gfs_id = GFS3_OP_CHECKSUM; - - conf = this->private; - - client_submit_request (this, &req, frame, conf->fops, GFS3_OP_CHECKSUM, - client3_1_checksum_cbk, NULL, xdr_from_checksum_req); - - return 0; -unwind: - STACK_UNWIND_STRICT (checksum, frame, -1, op_errno, NULL, NULL); - return 0; -} - - - int32_t client3_1_rchecksum (call_frame_t *frame, xlator_t *this, void *data) @@ -4748,7 +4665,6 @@ rpc_clnt_procedure_t clnt3_1_fop_actors[GF_FOP_MAXVALUE] = { [GF_FOP_FINODELK] = { "FINODELK", client3_1_finodelk }, [GF_FOP_ENTRYLK] = { "ENTRYLK", client3_1_entrylk }, [GF_FOP_FENTRYLK] = { "FENTRYLK", client3_1_fentrylk }, - [GF_FOP_CHECKSUM] = { "CHECKSUM", client3_1_checksum }, [GF_FOP_XATTROP] = { "XATTROP", client3_1_xattrop }, [GF_FOP_FXATTROP] = { "FXATTROP", client3_1_fxattrop }, [GF_FOP_FGETXATTR] = { "FGETXATTR", client3_1_fgetxattr }, @@ -4797,7 +4713,6 @@ char *clnt3_1_fop_names[GFS3_OP_MAXVALUE] = { [GFS3_OP_FINODELK] = "FINODELK", [GFS3_OP_ENTRYLK] = "ENTRYLK", [GFS3_OP_FENTRYLK] = "FENTRYLK", - [GFS3_OP_CHECKSUM] = "CHECKSUM", [GFS3_OP_XATTROP] = "XATTROP", [GFS3_OP_FXATTROP] = "FXATTROP", [GFS3_OP_FGETXATTR] = "FGETXATTR", -- cgit