From 01923eed1115e53c5be9fba3e72f75c7c631bf95 Mon Sep 17 00:00:00 2001 From: Amar Tumballi Date: Tue, 29 Jun 2010 05:36:30 +0000 Subject: minor fixes in rpc + protocol * proper use of mem_acct_init in client.c/server.c * fentrylk_resume to be called instead of finodelk_resume in server_fentrylk(). * handle the case of xdr decoding failure on server by sending the proper error reply to client, so there is no missing frame. * removed unwanted functions from server-helpers.c Signed-off-by: Amar Tumballi Signed-off-by: Anand V. Avati BUG: 875 (Implement a new protocol to provide proper backward/forward compatibility) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=875 --- xlators/protocol/client/src/client.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'xlators/protocol/client/src') diff --git a/xlators/protocol/client/src/client.c b/xlators/protocol/client/src/client.c index f75cf3c99d2..bad814a8198 100644 --- a/xlators/protocol/client/src/client.c +++ b/xlators/protocol/client/src/client.c @@ -1526,7 +1526,7 @@ out: } -static int32_t +int32_t mem_acct_init (xlator_t *this) { int ret = -1; @@ -1565,10 +1565,6 @@ init (xlator_t *this) "Volume is dangling. "); } - ret = mem_acct_init (this); - if (ret) - goto out; - conf = GF_CALLOC (1, sizeof (*conf), gf_client_mt_clnt_conf_t); if (!conf) goto out; -- cgit