From b87d96b97d4a0cdc0883bec8ea8b4730b82fb3ba Mon Sep 17 00:00:00 2001 From: Santosh Kumar Pradhan Date: Thu, 21 Nov 2013 17:13:58 +0530 Subject: gNFS: More clean up for Gluster NFS 1) Fix the typo in NFS default ACL The typo was introduced as part of the Fix to BZ 1009210 i.e. http://review.gluster.org/5980. The user ACL xattr structure was passed to default ACL xattr. 2) Clean up NFS code to avoid unnecessary SEGV in rpcsvc_drc_reconfigure() which was not validating the svc->drc. Add a routine rpcsvc_drc_deinit() to handle the clean up of DRC specific data structures. For init(), use rpcsvc_drc_init(). 3) nfs_init_state() was returning wrong value even if the registration with portmapper failed, causing the NFS server process to hang around. As a result it used to get SEGV during rpcsvc_drc_reconfigure(). 4) Clean up memfactor usage across nfs.c nfs3.c. Change-Id: I5cea26cb68dd8a822ec0ae104952f67fe63fa703 BUG: 1009210 Signed-off-by: Santosh Kumar Pradhan Reviewed-on: http://review.gluster.org/6329 Reviewed-by: Rajesh Joseph Tested-by: Gluster Build System Reviewed-by: Vijay Bellur --- rpc/rpc-lib/src/rpc-drc.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'rpc/rpc-lib/src/rpc-drc.h') diff --git a/rpc/rpc-lib/src/rpc-drc.h b/rpc/rpc-lib/src/rpc-drc.h index 7dfaef978..c42c2a2c2 100644 --- a/rpc/rpc-lib/src/rpc-drc.h +++ b/rpc/rpc-lib/src/rpc-drc.h @@ -71,7 +71,6 @@ struct drc_globals { struct list_head cache_head; uint32_t client_count; struct list_head clients_head; - gf_boolean_t enable_drc; }; int @@ -98,6 +97,9 @@ rpcsvc_drc_priv (rpcsvc_drc_globals_t *drc); int rpcsvc_drc_init (rpcsvc_t *svc, dict_t *options); +int +rpcsvc_drc_deinit (rpcsvc_t *svc); + int rpcsvc_drc_reconfigure (rpcsvc_t *svc, dict_t *options); -- cgit