8392 Do not cast the return value of xdr_free()

Reviewed by: Andrew Stormont <andyjstormont@gmail.com>
Reviewed by: Robert Mustacchi <rm@joyent.com>
Approved by: Richard Lowe <richlowe@richlowe.net>

13 files changed, 205 insertions, 229 deletions

diff --git a/usr/src/cmd/idmap/idmapd/adspriv_impl.c b/usr/src/cmd/idmap/idmapd/adspriv_impl.c
index b1dcbe3163..7386ada6f6 100644
--- a/usr/src/cmd/idmap/idmapd/adspriv_impl.c
+++ b/usr/src/cmd/idmap/idmapd/adspriv_impl.c
@@ -205,6 +205,6 @@ out:
 int
 adspriv_program_1_freeresult(SVCXPRT *xprt, xdrproc_t fun, caddr_t res)
 {
-	(void) xdr_free(fun, res);
+	xdr_free(fun, res);
 	return (TRUE);
 }
diff --git a/usr/src/cmd/idmap/idmapd/server.c b/usr/src/cmd/idmap/idmapd/server.c
index e27690a160..10b6486350 100644
--- a/usr/src/cmd/idmap/idmapd/server.c
+++ b/usr/src/cmd/idmap/idmapd/server.c
@@ -179,7 +179,7 @@ validate_rules(idmap_update_batch *batch)
 /* ARGSUSED */
 bool_t
 idmap_get_mapped_ids_1_svc(idmap_mapping_batch batch,
-		idmap_ids_res *result, struct svc_req *rqstp)
+    idmap_ids_res *result, struct svc_req *rqstp)
 {
 	sqlite		*cache = NULL, *db = NULL;
 	lookup_state_t	state;
@@ -718,7 +718,7 @@ out:
 	if (sql)
 		sqlite_freemem(sql);
 	if (IDMAP_ERROR(result->retcode))
-		(void) xdr_free(xdr_idmap_mappings_res, (caddr_t)result);
+		xdr_free(xdr_idmap_mappings_res, (caddr_t)result);
 	result->retcode = idmap_stat4prot(result->retcode);
 	return (TRUE);
 }
@@ -798,8 +798,7 @@ list_namerules_cb(void *parg, int argc, char **argv, char **colnames)
 /* ARGSUSED */
 bool_t
 idmap_list_namerules_1_svc(idmap_namerule rule, uint64_t lastrowid,
-		uint64_t limit, idmap_namerules_res *result,
-		struct svc_req *rqstp)
+    uint64_t limit, idmap_namerules_res *result, struct svc_req *rqstp)
 {
 
 	sqlite		*db = NULL;
@@ -865,7 +864,7 @@ out:
 	if (sql)
 		sqlite_freemem(sql);
 	if (IDMAP_ERROR(result->retcode))
-		(void) xdr_free(xdr_idmap_namerules_res, (caddr_t)result);
+		xdr_free(xdr_idmap_namerules_res, (caddr_t)result);
 	result->retcode = idmap_stat4prot(result->retcode);
 	return (TRUE);
 }
@@ -922,7 +921,7 @@ verify_rules_auth(struct svc_req *rqstp)
 /* ARGSUSED */
 bool_t
 idmap_update_1_svc(idmap_update_batch batch, idmap_update_res *res,
-		struct svc_req *rqstp)
+    struct svc_req *rqstp)
 {
 	sqlite		*db = NULL;
 	idmap_update_op	*up;
@@ -1113,7 +1112,7 @@ errout:
 /* ARGSUSED */
 bool_t
 idmap_get_mapped_id_by_name_1_svc(idmap_mapping request,
-		idmap_mappings_res *result, struct svc_req *rqstp)
+    idmap_mappings_res *result, struct svc_req *rqstp)
 {
 	idmap_mapping_batch batch_request;
 	idmap_ids_res batch_result;
@@ -1194,7 +1193,7 @@ out:
 /* ARGSUSED */
 bool_t
 idmap_get_prop_1_svc(idmap_prop_type request,
-		idmap_prop_res *result, struct svc_req *rqstp)
+    idmap_prop_res *result, struct svc_req *rqstp)
 {
 	idmap_pg_config_t *pgcfg;
 
@@ -1311,9 +1310,9 @@ idmap_flush_1_svc(
 /* ARGSUSED */
 int
 idmap_prog_1_freeresult(SVCXPRT *transp, xdrproc_t xdr_result,
-		caddr_t result)
+    caddr_t result)
 {
-	(void) xdr_free(xdr_result, result);
+	xdr_free(xdr_result, result);
 	return (TRUE);
 }
 
diff --git a/usr/src/lib/libidmap/common/idmap_api.c b/usr/src/lib/libidmap/common/idmap_api.c
index ddfefc39c2..54ee78bfe4 100644
--- a/usr/src/lib/libidmap/common/idmap_api.c
+++ b/usr/src/lib/libidmap/common/idmap_api.c
@@ -234,7 +234,7 @@ out:
 		_IDMAP_RESET_UDT_HANDLE(udthandle);
 	}
 
-	(void) xdr_free(xdr_idmap_update_res, (caddr_t)&res);
+	xdr_free(xdr_idmap_update_res, (caddr_t)&res);
 	errno = idmap_stat2errno(retcode);
 	return (retcode);
 }
@@ -414,9 +414,9 @@ idmap_udt_destroy(idmap_udt_handle_t *udthandle)
 {
 	if (udthandle == NULL)
 		return;
-	(void) xdr_free(xdr_idmap_update_batch, (caddr_t)&udthandle->batch);
-	(void) xdr_free(xdr_idmap_namerule, (caddr_t)&udthandle->error_rule);
-	(void) xdr_free(xdr_idmap_namerule, (caddr_t)&udthandle->conflict_rule);
+	xdr_free(xdr_idmap_update_batch, (caddr_t)&udthandle->batch);
+	xdr_free(xdr_idmap_namerule, (caddr_t)&udthandle->error_rule);
+	xdr_free(xdr_idmap_namerule, (caddr_t)&udthandle->conflict_rule);
 	free(udthandle);
 }
 
@@ -461,7 +461,7 @@ idmap_udt_add_namerule(idmap_udt_handle_t *udthandle, const char *windomain,
 errout:
 	/* The batch should still be usable */
 	if (rule)
-		(void) xdr_free(xdr_idmap_namerule, (caddr_t)rule);
+		xdr_free(xdr_idmap_namerule, (caddr_t)rule);
 	errno = idmap_stat2errno(retcode);
 	return (retcode);
 }
@@ -506,7 +506,7 @@ idmap_udt_rm_namerule(idmap_udt_handle_t *udthandle, boolean_t is_user,
 
 errout:
 	if (rule)
-		(void) xdr_free(xdr_idmap_namerule, (caddr_t)rule);
+		xdr_free(xdr_idmap_namerule, (caddr_t)rule);
 	errno = idmap_stat2errno(retcode);
 	return (retcode);
 }
@@ -565,9 +565,9 @@ idmap_iter_set_limit(idmap_iter_t *iter, uint64_t limit)
  * iter - iterator
  */
 idmap_stat
-idmap_iter_namerules(const char *windomain,
-		boolean_t is_user, boolean_t is_wuser, const char *winname,
-		const char *unixname, idmap_iter_t **iter)
+idmap_iter_namerules(const char *windomain, boolean_t is_user,
+    boolean_t is_wuser, const char *winname, const char *unixname,
+    idmap_iter_t **iter)
 {
 
 	idmap_iter_t			*tmpiter;
@@ -965,7 +965,7 @@ idmap_get_create(idmap_get_handle_t **gh)
  */
 idmap_stat
 idmap_get_uidbysid(idmap_get_handle_t *gh, char *sidprefix, idmap_rid_t rid,
-		int flag, uid_t *uid, idmap_stat *stat)
+    int flag, uid_t *uid, idmap_stat *stat)
 {
 	return (idmap_getext_uidbysid(gh, sidprefix, rid, flag, uid,
 	    NULL, stat));
@@ -989,7 +989,7 @@ idmap_get_uidbysid(idmap_get_handle_t *gh, char *sidprefix, idmap_rid_t rid,
 
 idmap_stat
 idmap_getext_uidbysid(idmap_get_handle_t *gh, char *sidprefix, idmap_rid_t rid,
-		int flag, uid_t *uid, idmap_info *info, idmap_stat *stat)
+    int flag, uid_t *uid, idmap_info *info, idmap_stat *stat)
 {
 	idmap_retcode	retcode;
 	idmap_mapping	*mapping = NULL;
@@ -1059,7 +1059,7 @@ errout:
  */
 idmap_stat
 idmap_get_gidbysid(idmap_get_handle_t *gh, char *sidprefix, idmap_rid_t rid,
-		int flag, gid_t *gid, idmap_stat *stat)
+    int flag, gid_t *gid, idmap_stat *stat)
 {
 	return (idmap_getext_gidbysid(gh, sidprefix, rid, flag, gid,
 	    NULL, stat));
@@ -1083,7 +1083,7 @@ idmap_get_gidbysid(idmap_get_handle_t *gh, char *sidprefix, idmap_rid_t rid,
  */
 idmap_stat
 idmap_getext_gidbysid(idmap_get_handle_t *gh, char *sidprefix, idmap_rid_t rid,
-		int flag, gid_t *gid, idmap_info *info, idmap_stat *stat)
+    int flag, gid_t *gid, idmap_info *info, idmap_stat *stat)
 {
 
 	idmap_retcode	retcode;
@@ -1156,7 +1156,7 @@ errout:
  */
 idmap_stat
 idmap_get_pidbysid(idmap_get_handle_t *gh, char *sidprefix, idmap_rid_t rid,
-		int flag, uid_t *pid, int *is_user, idmap_stat *stat)
+    int flag, uid_t *pid, int *is_user, idmap_stat *stat)
 {
 	return (idmap_getext_pidbysid(gh, sidprefix, rid, flag, pid, is_user,
 	    NULL, stat));
@@ -1183,7 +1183,7 @@ idmap_get_pidbysid(idmap_get_handle_t *gh, char *sidprefix, idmap_rid_t rid,
  */
 idmap_stat
 idmap_getext_pidbysid(idmap_get_handle_t *gh, char *sidprefix, idmap_rid_t rid,
-	int flag, uid_t *pid, int *is_user, idmap_info *info, idmap_stat *stat)
+    int flag, uid_t *pid, int *is_user, idmap_info *info, idmap_stat *stat)
 {
 	idmap_retcode	retcode;
 	idmap_mapping	*mapping = NULL;
@@ -1255,7 +1255,7 @@ errout:
  */
 idmap_stat
 idmap_get_sidbyuid(idmap_get_handle_t *gh, uid_t uid, int flag,
-		char **sidprefix, idmap_rid_t *rid, idmap_stat *stat)
+    char **sidprefix, idmap_rid_t *rid, idmap_stat *stat)
 {
 	return (idmap_getext_sidbyuid(gh, uid, flag, sidprefix, rid,
 	    NULL, stat));
@@ -1279,7 +1279,7 @@ idmap_get_sidbyuid(idmap_get_handle_t *gh, uid_t uid, int flag,
  */
 idmap_stat
 idmap_getext_sidbyuid(idmap_get_handle_t *gh, uid_t uid, int flag,
-	char **sidprefix, idmap_rid_t *rid, idmap_info *info, idmap_stat *stat)
+    char **sidprefix, idmap_rid_t *rid, idmap_info *info, idmap_stat *stat)
 {
 
 	idmap_retcode	retcode;
@@ -1346,7 +1346,7 @@ errout:
  */
 idmap_stat
 idmap_get_sidbygid(idmap_get_handle_t *gh, gid_t gid, int flag,
-		char **sidprefix, idmap_rid_t *rid, idmap_stat *stat)
+    char **sidprefix, idmap_rid_t *rid, idmap_stat *stat)
 {
 	return (idmap_getext_sidbygid(gh, gid, flag, sidprefix, rid,
 	    NULL, stat));
@@ -1370,7 +1370,7 @@ idmap_get_sidbygid(idmap_get_handle_t *gh, gid_t gid, int flag,
  */
 idmap_stat
 idmap_getext_sidbygid(idmap_get_handle_t *gh, gid_t gid, int flag,
-	char **sidprefix, idmap_rid_t *rid, idmap_info *info, idmap_stat *stat)
+    char **sidprefix, idmap_rid_t *rid, idmap_info *info, idmap_stat *stat)
 {
 
 	idmap_retcode	retcode;
@@ -1569,7 +1569,7 @@ idmap_get_mappings(idmap_get_handle_t *gh)
 
 out:
 	_IDMAP_RESET_GET_HANDLE(gh);
-	(void) xdr_free(xdr_idmap_ids_res, (caddr_t)&res);
+	xdr_free(xdr_idmap_ids_res, (caddr_t)&res);
 	errno = idmap_stat2errno(retcode);
 	return (retcode);
 }
@@ -1583,7 +1583,7 @@ idmap_get_destroy(idmap_get_handle_t *gh)
 {
 	if (gh == NULL)
 		return;
-	(void) xdr_free(xdr_idmap_mapping_batch, (caddr_t)&gh->batch);
+	xdr_free(xdr_idmap_mapping_batch, (caddr_t)&gh->batch);
 	if (gh->retlist)
 		free(gh->retlist);
 	free(gh);
@@ -2105,7 +2105,7 @@ idmap_how_clear(idmap_how *how)
  */
 idmap_stat
 idmap_getuidbywinname(const char *name, const char *domain, int flag,
-	uid_t *uid)
+    uid_t *uid)
 {
 	idmap_retcode	rc;
 	int		is_user = 1;
@@ -2140,7 +2140,7 @@ idmap_getuidbywinname(const char *name, const char *domain, int flag,
  */
 idmap_stat
 idmap_getgidbywinname(const char *name, const char *domain, int flag,
-	gid_t *gid)
+    gid_t *gid)
 {
 	idmap_retcode	rc;
 	int		is_user = 0;
@@ -2176,7 +2176,7 @@ idmap_getgidbywinname(const char *name, const char *domain, int flag,
  */
 idmap_stat
 idmap_getwinnamebypid(uid_t pid, int is_user, int flag, char **name,
-	char **domain)
+    char **domain)
 {
 	idmap_retcode	rc;
 	int		len;
diff --git a/usr/src/lib/libidmap/common/idmap_impl.h b/usr/src/lib/libidmap/common/idmap_impl.h
index 8dd4a7efb2..bcae8b6d8d 100644
--- a/usr/src/lib/libidmap/common/idmap_impl.h
+++ b/usr/src/lib/libidmap/common/idmap_impl.h
@@ -53,11 +53,11 @@ struct idmap_udt_handle {
 };
 
 #define	_IDMAP_RESET_UDT_HANDLE(uh) \
-	(void) xdr_free(xdr_idmap_update_batch, (caddr_t)&uh->batch);\
+	xdr_free(xdr_idmap_update_batch, (caddr_t)&uh->batch);\
 	uh->next = 0;\
 	uh->error_index = -1;\
-	(void) xdr_free(xdr_idmap_namerule, (caddr_t)&uh->error_rule);\
-	(void) xdr_free(xdr_idmap_namerule, (caddr_t)&uh->conflict_rule);
+	xdr_free(xdr_idmap_namerule, (caddr_t)&uh->error_rule);\
+	xdr_free(xdr_idmap_namerule, (caddr_t)&uh->conflict_rule);
 
 typedef struct idmap_get_res {
 	idmap_id_type	idtype;
@@ -78,7 +78,7 @@ struct idmap_get_handle {
 };
 
 #define	_IDMAP_RESET_GET_HANDLE(gh) \
-	(void) xdr_free(xdr_idmap_mapping_batch, (caddr_t)&gh->batch);\
+	xdr_free(xdr_idmap_mapping_batch, (caddr_t)&gh->batch);\
 	if (gh->retlist) \
 		free(gh->retlist);\
 	gh->retlist = NULL;\
diff --git a/usr/src/uts/common/fs/nfs/nfs4_callback.c b/usr/src/uts/common/fs/nfs/nfs4_callback.c
index d61c5fd253..729c8658fe 100644
--- a/usr/src/uts/common/fs/nfs/nfs4_callback.c
+++ b/usr/src/uts/common/fs/nfs/nfs4_callback.c
@@ -169,7 +169,7 @@ static void nfs4delegreturn_cleanup_impl(rnode4_t *, nfs4_server_t *,
 
 static void
 cb_getattr(nfs_cb_argop4 *argop, nfs_cb_resop4 *resop, struct svc_req *req,
-	struct compound_state *cs, struct nfs4_callback_globals *ncg)
+    struct compound_state *cs, struct nfs4_callback_globals *ncg)
 {
 	CB_GETATTR4args *args = &argop->nfs_cb_argop4_u.opcbgetattr;
 	CB_GETATTR4res *resp = &resop->nfs_cb_resop4_u.opcbgetattr;
@@ -382,7 +382,7 @@ cb_getattr_free(nfs_cb_resop4 *resop)
 
 static void
 cb_recall(nfs_cb_argop4 *argop, nfs_cb_resop4 *resop, struct svc_req *req,
-	struct compound_state *cs, struct nfs4_callback_globals *ncg)
+    struct compound_state *cs, struct nfs4_callback_globals *ncg)
 {
 	CB_RECALL4args * args = &argop->nfs_cb_argop4_u.opcbrecall;
 	CB_RECALL4res *resp = &resop->nfs_cb_resop4_u.opcbrecall;
@@ -536,7 +536,7 @@ cb_null(CB_COMPOUND4args *args, CB_COMPOUND4res *resp, struct svc_req *req,
 /* ARGSUSED */
 static void
 cb_illegal(nfs_cb_argop4 *argop, nfs_cb_resop4 *resop, struct svc_req *req,
-	struct compound_state *cs, struct nfs4_callback_globals *ncg)
+    struct compound_state *cs, struct nfs4_callback_globals *ncg)
 {
 	CB_ILLEGAL4res *resp = &resop->nfs_cb_resop4_u.opcbillegal;
 
@@ -547,7 +547,7 @@ cb_illegal(nfs_cb_argop4 *argop, nfs_cb_resop4 *resop, struct svc_req *req,
 
 static void
 cb_compound(CB_COMPOUND4args *args, CB_COMPOUND4res *resp, struct svc_req *req,
-	struct nfs4_callback_globals *ncg)
+    struct nfs4_callback_globals *ncg)
 {
 	uint_t i;
 	struct compound_state cs;
@@ -806,7 +806,7 @@ nfs4callback_destroy(nfs4_server_t *np)
  */
 static void
 nfs4_setport(char *netid, char *uaddr, char *protofmly, char *proto,
-	struct nfs4_callback_globals *ncg)
+    struct nfs4_callback_globals *ncg)
 {
 	struct nfs4_cb_port *p;
 	bool_t found = FALSE;
@@ -1290,7 +1290,7 @@ nfs4_callback_fini(void)
  */
 static void
 nfs4delegreturn_cleanup_impl(rnode4_t *rp, nfs4_server_t *np,
-	struct nfs4_callback_globals *ncg)
+    struct nfs4_callback_globals *ncg)
 {
 	mntinfo4_t *mi = VTOMI4(RTOV4(rp));
 	boolean_t need_rele = B_FALSE;
@@ -1373,7 +1373,7 @@ nfs4delegreturn_cleanup(rnode4_t *rp, nfs4_server_t *np)
 
 static void
 nfs4delegreturn_save_lost_rqst(int error, nfs4_lost_rqst_t *lost_rqstp,
-	cred_t *cr, vnode_t *vp)
+    cred_t *cr, vnode_t *vp)
 {
 	if (error != ETIMEDOUT && error != EINTR &&
 	    !NFS4_FRC_UNMT_ERR(error, vp->v_vfsp)) {
@@ -1439,12 +1439,12 @@ nfs4delegreturn_otw(rnode4_t *rp, cred_t *cr, nfs4_error_t *ep)
 		nfs4_attr_cache(RTOV4(rp), garp, t, cr, TRUE, NULL);
 
 	}
-	(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+	xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 }
 
 int
 nfs4_do_delegreturn(rnode4_t *rp, int flags, cred_t *cr,
-	struct nfs4_callback_globals *ncg)
+    struct nfs4_callback_globals *ncg)
 {
 	vnode_t *vp = RTOV4(rp);
 	mntinfo4_t *mi = VTOMI4(vp);
@@ -1536,7 +1536,7 @@ nfs4_do_delegreturn(rnode4_t *rp, int flags, cred_t *cr,
  */
 void
 nfs4_resend_delegreturn(nfs4_lost_rqst_t *lorp, nfs4_error_t *ep,
-	nfs4_server_t *np)
+    nfs4_server_t *np)
 {
 	rnode4_t *rp = VTOR4(lorp->lr_vp);
 
@@ -1879,7 +1879,7 @@ nfs4_deleg_discard(mntinfo4_t *mi, nfs4_server_t *sp)
 
 static int
 deleg_reopen(vnode_t *vp, bool_t *recovp, struct nfs4_callback_globals *ncg,
-	int flags)
+    int flags)
 {
 	nfs4_open_stream_t *osp;
 	nfs4_recov_state_t recov_state;
@@ -2151,7 +2151,7 @@ out:
  */
 void
 nfs4_delegation_accept(rnode4_t *rp, open_claim_type4 claim, OPEN4res *res,
-	nfs4_ga_res_t *garp, cred_t *cr)
+    nfs4_ga_res_t *garp, cred_t *cr)
 {
 	open_read_delegation4 *orp;
 	open_write_delegation4 *owp;
@@ -2385,7 +2385,7 @@ nfs4delegabandon(rnode4_t *rp)
 
 static int
 wait_for_recall1(vnode_t *vp, nfs4_op_hint_t op, nfs4_recov_state_t *rsp,
-	int flg)
+    int flg)
 {
 	rnode4_t *rp;
 	int error = 0;
@@ -2426,7 +2426,7 @@ nfs4_end_op_recall(vnode_t *vp1, vnode_t *vp2, nfs4_recov_state_t *rsp)
 
 int
 wait_for_recall(vnode_t *vp1, vnode_t *vp2, nfs4_op_hint_t op,
-	nfs4_recov_state_t *rsp)
+    nfs4_recov_state_t *rsp)
 {
 	int error;
 
diff --git a/usr/src/uts/common/fs/nfs/nfs4_client.c b/usr/src/uts/common/fs/nfs/nfs4_client.c
index 3d231c7e6c..1734853f57 100644
--- a/usr/src/uts/common/fs/nfs/nfs4_client.c
+++ b/usr/src/uts/common/fs/nfs/nfs4_client.c
@@ -924,13 +924,13 @@ nfs4_getattr_otw_norecovery(vnode_t *vp, nfs4_ga_res_t *garp,
 		return;
 
 	if (res.status != NFS4_OK) {
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		return;
 	}
 
 	*garp = res.array[1].nfs_resop4_u.opgetattr.ga_res;
 
-	(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+	xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 }
 
 /*
@@ -1040,7 +1040,7 @@ recov_retry:
 		nfs4_end_fop(VTOMI4(vp), vp, NULL, OH_GETATTR, &recov_state,
 		    needrecov);
 		if (!e.error) {
-			(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+			xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			e.error = geterrno4(res.status);
 		}
 		if (abort == FALSE)
@@ -1061,7 +1061,7 @@ recov_retry:
 			    ga_res.n4g_ext_res,
 			    garp->n4g_ext_res, sizeof (nfs4_ga_ext_res_t));
 	}
-	(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+	xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 	nfs4_end_fop(VTOMI4(vp), vp, NULL, OH_GETATTR, &recov_state,
 	    needrecov);
 	return (e.error);
@@ -3521,7 +3521,7 @@ recov_retry:
 	    after_time.tv_sec, after_time.tv_nsec));
 
 	if (e.error == 0 && res.status == NFS4ERR_CB_PATH_DOWN) {
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		nfs4_delegreturn_all(sp);
 		nfs4_end_op(mi, NULL, NULL, &recov_state, needrecov);
 		VFS_RELE(mi->mi_vfsp);
@@ -3552,8 +3552,7 @@ recov_retry:
 			nfs4_end_op(mi, NULL, NULL, &recov_state, needrecov);
 			VFS_RELE(mi->mi_vfsp);
 			if (!e.error)
-				(void) xdr_free(xdr_COMPOUND4res_clnt,
-				    (caddr_t)&res);
+				xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			mutex_enter(&sp->s_lock);
 			goto recov_retry;
 		}
@@ -3572,7 +3571,7 @@ recov_retry:
 	}
 
 	if (!rpc_error)
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 
 	nfs4_end_op(mi, NULL, NULL, &recov_state, needrecov);
 
diff --git a/usr/src/uts/common/fs/nfs/nfs4_client_secinfo.c b/usr/src/uts/common/fs/nfs/nfs4_client_secinfo.c
index ed2c2c167a..a9bfca9fd6 100644
--- a/usr/src/uts/common/fs/nfs/nfs4_client_secinfo.c
+++ b/usr/src/uts/common/fs/nfs/nfs4_client_secinfo.c
@@ -486,7 +486,7 @@ retry:
 	}
 
 	if (res.status == NFS4ERR_WRONGSEC) {
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		if (secinfo_check(mi->mi_curr_serv))
 			goto retry;
 		/*
@@ -502,12 +502,12 @@ retry:
 		    "secinfo_tryroot_otw: let the caller retry\n"));
 
 		if (!e.error)
-			(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+			xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		return (0);
 	}
 
 	if (res.status) {
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		return (geterrno4(res.status));
 	}
 
@@ -518,7 +518,7 @@ retry:
 	 * SV4_TRYSECINFO has been cleared in rfs4call.
 	 * sv_currsec will be used.
 	 */
-	(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+	xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 	return (e.error);
 }
 
@@ -702,7 +702,7 @@ retry:
 			nfs4args_lookup_free(argop, num_argops);
 			kmem_free(argop,
 			    lookuparg.arglen * sizeof (nfs_argop4));
-			(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+			xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			kmem_free(tmp_path, path_len + 1);
 
 			if (e.error = secinfo_tryroot_otw(mi, cr)) {
@@ -713,7 +713,7 @@ retry:
 		ncomp = res.array_len - 1;
 		nfs4args_lookup_free(argop, num_argops);
 		kmem_free(argop, lookuparg.arglen * sizeof (nfs_argop4));
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		kmem_free(tmp_path, path_len + 1);
 		goto retry;
 	}
@@ -732,8 +732,7 @@ retry:
 		if (!isrecov) {
 			if (!e.error) {
 				e.error = geterrno4(res.status);
-				(void) xdr_free(xdr_COMPOUND4res_clnt,
-				    (caddr_t)&res);
+				xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			}
 
 			nfs4args_lookup_free(argop, num_argops);
@@ -750,7 +749,7 @@ retry:
 		    NULL, NULL, NULL, OP_SECINFO, NULL, NULL, NULL);
 		if (!e.error) {
 			e.error = geterrno4(res.status);
-			(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+			xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		}
 		nfs4args_lookup_free(argop, num_argops);
 		kmem_free(argop, lookuparg.arglen * sizeof (nfs_argop4));
@@ -768,7 +767,7 @@ retry:
 	if (res.status) {
 		nfs4args_lookup_free(argop, num_argops);
 		kmem_free(argop, lookuparg.arglen * sizeof (nfs_argop4));
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		kmem_free(tmp_path, path_len + 1);
 		return (geterrno4(res.status));
 	}
@@ -787,7 +786,7 @@ retry:
 		 */
 		nfs4args_lookup_free(argop, num_argops);
 		kmem_free(tmp_path, path_len + 1);
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		kmem_free(argop, num_argops * sizeof (nfs_argop4));
 		return (EACCES);
 	}
@@ -804,7 +803,7 @@ retry:
 		 */
 		nfs4args_lookup_free(argop, num_argops);
 		kmem_free(argop, lookuparg.arglen * sizeof (nfs_argop4));
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		kmem_free(tmp_path, path_len + 1);
 		return (EACCES);
 	}
@@ -819,7 +818,7 @@ retry:
 		ncomp = tcomp;
 		nfs4args_lookup_free(argop, num_argops);
 		kmem_free(argop, lookuparg.arglen * sizeof (nfs_argop4));
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		kmem_free(tmp_path, path_len + 1);
 		goto retry;
 	}
@@ -827,7 +826,7 @@ retry:
 	/* Done! */
 	nfs4args_lookup_free(argop, num_argops);
 	kmem_free(argop, lookuparg.arglen * sizeof (nfs_argop4));
-	(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+	xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 	kmem_free(tmp_path, path_len + 1);
 
 	return (0); /* got the secinfo */
@@ -943,7 +942,7 @@ nfs4_secinfo_fh_otw(mntinfo4_t *mi, nfs4_sharedfh_t *fh, char *nm, cred_t *cr)
 		return (e.error);
 
 	if (res.status) {
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		return (geterrno4(res.status));
 	}
 
@@ -958,7 +957,7 @@ nfs4_secinfo_fh_otw(mntinfo4_t *mi, nfs4_sharedfh_t *fh, char *nm, cred_t *cr)
 		 * Server does not return any flavor for this export point.
 		 * Return EACCES.
 		 */
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		return (EACCES);
 	}
 
@@ -973,13 +972,13 @@ nfs4_secinfo_fh_otw(mntinfo4_t *mi, nfs4_sharedfh_t *fh, char *nm, cred_t *cr)
 		 * the client does not have netname/syncaddr data
 		 * from sv_dhsec.
 		 */
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		return (EACCES);
 	}
 	nfs_rw_exit(&svp->sv_lock);
 
 	/* Done! */
-	(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+	xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 
 	return (0); /* got the secinfo */
 }
diff --git a/usr/src/uts/common/fs/nfs/nfs4_client_state.c b/usr/src/uts/common/fs/nfs/nfs4_client_state.c
index d8e79a9f4a..8b082582d6 100644
--- a/usr/src/uts/common/fs/nfs/nfs4_client_state.c
+++ b/usr/src/uts/common/fs/nfs/nfs4_client_state.c
@@ -1964,7 +1964,7 @@ cred_retry:
 		cred_otw = cr;
 		crhold(cred_otw);
 		if (!ep->error)
-			(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+			xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		goto cred_retry;
 	}
 
@@ -1998,7 +1998,7 @@ cred_retry:
 	}
 
 	if (!ep->error)
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 
 no_args_out:
 	crfree(cred_otw);
@@ -2247,8 +2247,7 @@ nfs4_resend_open_otw(vnode_t **vpp, nfs4_lost_rqst_t *resend_rqstp,
 				nfs4_end_open_seqid_sync(oop);
 				kmem_free(destcfp, destclen + 1);
 				nfs4args_copen_free(open_args);
-				(void) xdr_free(xdr_COMPOUND4res_clnt,
-				    (caddr_t)&res);
+				xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 				nfs_rw_exit(&mi->mi_fh_lock);
 				nfs4_fail_recov(vp, failed_msg, ep->error,
 				    ep->stat);
@@ -2279,7 +2278,7 @@ nfs4_resend_open_otw(vnode_t **vpp, nfs4_lost_rqst_t *resend_rqstp,
 					nfs4_end_open_seqid_sync(oop);
 					kmem_free(destcfp, destclen + 1);
 					nfs4args_copen_free(open_args);
-					(void) xdr_free(xdr_COMPOUND4res_clnt,
+					xdr_free(xdr_COMPOUND4res_clnt,
 					    (caddr_t)&res);
 					nfs_rw_exit(&mi->mi_fh_lock);
 					nfs4_fail_recov(vp, failed_msg,
@@ -2319,7 +2318,7 @@ nfs4_resend_open_otw(vnode_t **vpp, nfs4_lost_rqst_t *resend_rqstp,
 		kmem_free(destcfp, destclen + 1);
 		nfs4args_copen_free(open_args);
 		if (!ep->error)
-			(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+			xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		return;
 	}
 
@@ -2390,7 +2389,7 @@ nfs4_resend_open_otw(vnode_t **vpp, nfs4_lost_rqst_t *resend_rqstp,
 	else
 		PURGE_ATTRCACHE4(vp);
 
-	(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+	xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 
 	ASSERT(nfs4_consistent_type(vp));
 
@@ -2401,5 +2400,5 @@ err_out:
 	kmem_free(destcfp, destclen + 1);
 	nfs4args_copen_free(open_args);
 	if (!ep->error)
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 }
diff --git a/usr/src/uts/common/fs/nfs/nfs4_srv_deleg.c b/usr/src/uts/common/fs/nfs/nfs4_srv_deleg.c
index 445a6d2e3a..bb3f1bdd95 100644
--- a/usr/src/uts/common/fs/nfs/nfs4_srv_deleg.c
+++ b/usr/src/uts/common/fs/nfs/nfs4_srv_deleg.c
@@ -744,7 +744,7 @@ rfs4freeargres(CB_COMPOUND4args *args, CB_COMPOUND4res *resp)
 
 	kmem_free(args->array, arglen * sizeof (nfs_cb_argop4));
 	if (resp)
-		(void) xdr_free(xdr_CB_COMPOUND4res, (caddr_t)resp);
+		xdr_free(xdr_CB_COMPOUND4res, (caddr_t)resp);
 }
 
 /*
diff --git a/usr/src/uts/common/fs/nfs/nfs4_stub_vnops.c b/usr/src/uts/common/fs/nfs/nfs4_stub_vnops.c
index c937257550..de0d81dba4 100644
--- a/usr/src/uts/common/fs/nfs/nfs4_stub_vnops.c
+++ b/usr/src/uts/common/fs/nfs/nfs4_stub_vnops.c
@@ -455,7 +455,7 @@ nfs4_trigger_getattr(vnode_t *vp, struct vattr *vap, int flags, cred_t *cr,
 
 static int
 nfs4_trigger_setattr(vnode_t *vp, struct vattr *vap, int flags, cred_t *cr,
-		caller_context_t *ct)
+    caller_context_t *ct)
 {
 	int error;
 	vnode_t *newvp;
@@ -1506,7 +1506,7 @@ nfs4_fetch_locations(mntinfo4_t *mi, nfs4_sharedfh_t *sfh, char *nm,
 exit:
 	if (retval == 0) {
 		/* the call was ok but failed validating the call results */
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 	} else {
 		ASSERT(callres != NULL);
 		*callres = res;
@@ -1548,7 +1548,7 @@ find_referral_stubvp(vnode_t *dvp, char *nm, cred_t *cr)
 	    &garp, &callres, FALSE) == 0)
 		return (NULL);
 	mnt_on_fileid = garp.n4g_mon_fid;
-	(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&callres);
+	xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&callres);
 
 	/*
 	 * Build a fake filehandle from the dir FH and the mounted_on_fileid
@@ -1648,7 +1648,7 @@ nfs4_process_referral(mntinfo4_t *mi, nfs4_sharedfh_t *sfh,
 		DTRACE_PROBE3(nfs4clnt__debug__referral__migration,
 		    mntinfo4_t *, mi, nfs4_ga_res_t *, &garp,
 		    char *, "nfs4_process_referral");
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&callres);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&callres);
 		return (-1);
 	}
 
@@ -1675,14 +1675,14 @@ nfs4_process_referral(mntinfo4_t *mi, nfs4_sharedfh_t *sfh,
 		    sockaddr_in *, (struct sockaddr_in *)nfsfsloc.addr->buf,
 		    char *, "nfs4_process_referral");
 
-		(void) xdr_free(xdr_nfs_fsl_info, (char *)&nfsfsloc);
+		xdr_free(xdr_nfs_fsl_info, (char *)&nfsfsloc);
 	}
 	knc = nfsfsloc.knconf;
 	if ((i >= garp.n4g_ext_res->n4g_fslocations.locations_len) ||
 	    (knc->knc_protofmly == NULL) || (knc->knc_proto == NULL)) {
 		DTRACE_PROBE2(nfs4clnt__debug__referral__nofsloc,
 		    nfs4_ga_res_t *, &garp, char *, "nfs4_process_referral");
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&callres);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&callres);
 		return (-1);
 	}
 
@@ -1813,8 +1813,8 @@ nfs4_trigger_esi_create_referral(vnode_t *vp, cred_t *cr)
 	kmem_free(p, MAXPATHLEN);
 
 	/* Allocated in nfs4_process_referral() */
-	(void) xdr_free(xdr_nfs_fsl_info, (char *)&nfsfsloc);
-	(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&callres);
+	xdr_free(xdr_nfs_fsl_info, (char *)&nfsfsloc);
+	xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&callres);
 
 	return (esi);
 err:
@@ -1827,8 +1827,8 @@ err:
 	kmem_free(esi->esi_knconf, sizeof (*esi->esi_knconf));
 	kmem_free(esi->esi_netname, nfsfsloc.netnm_len);
 	kmem_free(esi, sizeof (ephemeral_servinfo_t));
-	(void) xdr_free(xdr_nfs_fsl_info, (char *)&nfsfsloc);
-	(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&callres);
+	xdr_free(xdr_nfs_fsl_info, (char *)&nfsfsloc);
+	xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&callres);
 	return (NULL);
 }
 
diff --git a/usr/src/uts/common/fs/nfs/nfs4_subr.c b/usr/src/uts/common/fs/nfs/nfs4_subr.c
index 991217ff5f..ec5fda53a0 100644
--- a/usr/src/uts/common/fs/nfs/nfs4_subr.c
+++ b/usr/src/uts/common/fs/nfs/nfs4_subr.c
@@ -1774,7 +1774,7 @@ exit:
 	kmem_free(argop, lookuparg.arglen * sizeof (nfs_argop4));
 
 	if (!ep->error)
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 	kmem_free(path, strlen(path)+1);
 }
 
diff --git a/usr/src/uts/common/fs/nfs/nfs4_vfsops.c b/usr/src/uts/common/fs/nfs/nfs4_vfsops.c
index 151cb62403..8efaf20602 100644
--- a/usr/src/uts/common/fs/nfs/nfs4_vfsops.c
+++ b/usr/src/uts/common/fs/nfs/nfs4_vfsops.c
@@ -262,7 +262,8 @@ nfs4fini(void)
  */
 static struct sec_data *
 create_authdh_data(char *netname, int nlen, struct netbuf *syncaddr,
-		struct knetconfig *knconf) {
+    struct knetconfig *knconf)
+{
 	struct sec_data *secdata;
 	dh_k4_clntdata_t *data;
 	char *pf, *p;
@@ -310,7 +311,8 @@ create_authdh_data(char *netname, int nlen, struct netbuf *syncaddr,
  * is responsible for freeing.
  */
 sec_data_t *
-copy_sec_data(sec_data_t *fsecdata) {
+copy_sec_data(sec_data_t *fsecdata)
+{
 	sec_data_t *tsecdata;
 
 	if (fsecdata == NULL)
@@ -1285,8 +1287,7 @@ recov_retry:
 		    OP_READLINK, NULL, NULL, NULL) == FALSE) {
 			nfs4_end_op(mi, NULL, NULL, &recov_state, needrecov);
 			if (!e.error)
-				(void) xdr_free(xdr_COMPOUND4res_clnt,
-				    (caddr_t)&res);
+				xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			goto recov_retry;
 		}
 	}
@@ -1303,7 +1304,7 @@ recov_retry:
 
 	if (res.status) {
 		e.error = geterrno4(res.status);
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		if (! recovery)
 			nfs4_end_op(mi, NULL, NULL, &recov_state, needrecov);
 		sfh4_rele(&sfh);
@@ -1322,7 +1323,7 @@ recov_retry:
 	if (! recovery)
 		nfs4_end_op(mi, NULL, NULL, &recov_state, needrecov);
 	sfh4_rele(&sfh);
-	(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+	xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 	return (0);
 }
 
@@ -1800,8 +1801,7 @@ recov_retry:
 			kmem_free(argop,
 			    lookuparg.arglen * sizeof (nfs_argop4));
 			if (!ep->error)
-				(void) xdr_free(xdr_COMPOUND4res_clnt,
-				    (caddr_t)&res);
+				xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			return;
 		}
 
@@ -1812,7 +1812,7 @@ recov_retry:
 		    NULL, NULL, NULL, OP_GETFH, NULL, NULL, NULL);
 		if (!ep->error) {
 			ep->error = geterrno4(res.status);
-			(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+			xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		}
 		nfs4args_lookup_free(argop, num_argops);
 		kmem_free(argop, lookuparg.arglen * sizeof (nfs_argop4));
@@ -1846,7 +1846,7 @@ is_link_err:
 		}
 		nfs4args_lookup_free(argop, num_argops);
 		kmem_free(argop, lookuparg.arglen * sizeof (nfs_argop4));
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		return;
 	}
 
@@ -1901,7 +1901,7 @@ is_link_err:
 
 		nfs4args_lookup_free(argop, num_argops);
 		kmem_free(argop, lookuparg.arglen * sizeof (nfs_argop4));
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 
 		if (ep->error)
 			return;
@@ -1984,7 +1984,7 @@ is_link_err:
 
 		nfs4args_lookup_free(argop, num_argops);
 		kmem_free(argop, lookuparg.arglen * sizeof (nfs_argop4));
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 
 		if (ep->error)
 			return;
@@ -2033,7 +2033,7 @@ is_link_err:
 	nfs_rw_exit(&svp->sv_lock);
 	nfs4args_lookup_free(argop, num_argops);
 	kmem_free(argop, lookuparg.arglen * sizeof (nfs_argop4));
-	(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+	xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 	if (!recovery)
 		nfs4_end_fop(mi, NULL, NULL, OH_MOUNT, &recov_state, needrecov);
 }
@@ -3517,12 +3517,12 @@ nfs4setclientid_otw(mntinfo4_t *mi, struct servinfo4 *svp,  cred_t *cr,
 		 * handling of clientid in use errors (regen another
 		 * clientid and try again?)
 		 */
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		return;
 	}
 
 	if (res.status) {
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		return;
 	}
 
@@ -3548,7 +3548,7 @@ nfs4setclientid_otw(mntinfo4_t *mi, struct servinfo4 *svp,  cred_t *cr,
 	}
 #endif
 
-	(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+	xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 
 	/* Confirm the client id and get the lease_time attribute */
 
@@ -3601,12 +3601,12 @@ nfs4setclientid_otw(mntinfo4_t *mi, struct servinfo4 *svp,  cred_t *cr,
 			    clid_inuse->r_netid, clid_inuse->r_addr);
 		}
 
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		return;
 	}
 
 	if (res.status) {
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		return;
 	}
 
@@ -3629,7 +3629,7 @@ nfs4setclientid_otw(mntinfo4_t *mi, struct servinfo4 *svp,  cred_t *cr,
 	}
 	mutex_exit(&np->s_lock);
 
-	(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+	xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 }
 
 /*
diff --git a/usr/src/uts/common/fs/nfs/nfs4_vnops.c b/usr/src/uts/common/fs/nfs/nfs4_vnops.c
index 4924385037..4112cbee05 100644
--- a/usr/src/uts/common/fs/nfs/nfs4_vnops.c
+++ b/usr/src/uts/common/fs/nfs/nfs4_vnops.c
@@ -1215,7 +1215,7 @@ recov_retry:
 			nfs4args_setattr_free(&argop[9]);
 		}
 		if (!e.error)
-			(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+			xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		if (ncr != NULL) {
 			crfree(ncr);
 			ncr = NULL;
@@ -1257,7 +1257,7 @@ recov_retry:
 			nfs4args_verify_free(&argop[8]);
 			nfs4args_setattr_free(&argop[9]);
 		}
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		nfs4_end_op(VTOMI4(dvp), dvp, vpi, &recov_state, needrecov);
 		/*
 		 * If the reply is NFS4ERR_ACCESS, it may be because
@@ -1360,7 +1360,7 @@ recov_retry:
 				nfs4args_verify_free(&argop[8]);
 				nfs4args_setattr_free(&argop[9]);
 			}
-			(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+			xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			nfs4_end_op(VTOMI4(dvp), dvp, vpi, &recov_state,
 			    needrecov);
 			open_owner_rele(oop);
@@ -1400,7 +1400,7 @@ recov_retry:
 				nfs4args_verify_free(&argop[8]);
 				nfs4args_setattr_free(&argop[9]);
 			}
-			(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+			xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			nfs4_end_op(VTOMI4(dvp), dvp, vpi, &recov_state,
 			    needrecov);
 			open_owner_rele(oop);
@@ -1469,7 +1469,7 @@ recov_retry:
 			nfs4args_verify_free(&argop[8]);
 			nfs4args_setattr_free(&argop[9]);
 		}
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		nfs4_end_op(VTOMI4(dvp), dvp, vpi, &recov_state, needrecov);
 		if (create_flag || fh_differs)
 			VN_RELE(vp);
@@ -1635,7 +1635,7 @@ skip_update_dircaches:
 		nfs4args_verify_free(&argop[8]);
 		nfs4args_setattr_free(&argop[9]);
 	}
-	(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+	xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 
 	if (ncr)
 		crfree(ncr);
@@ -1952,7 +1952,7 @@ top:
 		    NULL, OP_OPEN, bsep, NULL, NULL);
 
 		nfs4args_copen_free(open_args);
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		nfs4_end_open_seqid_sync(oop);
 		open_owner_rele(oop);
 		oop = NULL;
@@ -1961,7 +1961,7 @@ top:
 		goto kill_file;
 	case NFS4ERR_NO_GRACE:
 		nfs4args_copen_free(open_args);
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		nfs4_end_open_seqid_sync(oop);
 		open_owner_rele(oop);
 		oop = NULL;
@@ -1985,7 +1985,7 @@ top:
 	case NFS4ERR_GRACE:
 		nfs4_set_grace_wait(mi);
 		nfs4args_copen_free(open_args);
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		nfs4_end_open_seqid_sync(oop);
 		open_owner_rele(oop);
 		oop = NULL;
@@ -1996,7 +1996,7 @@ top:
 	case NFS4ERR_DELAY:
 		nfs4_set_delay_wait(vp);
 		nfs4args_copen_free(open_args);
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		nfs4_end_open_seqid_sync(oop);
 		open_owner_rele(oop);
 		oop = NULL;
@@ -2010,7 +2010,7 @@ top:
 		abort = nfs4_start_recovery(ep,
 		    mi, vp, NULL, NULL, NULL, OP_OPEN, NULL, NULL, NULL);
 		nfs4args_copen_free(open_args);
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		nfs4_end_open_seqid_sync(oop);
 		open_owner_rele(oop);
 		oop = NULL;
@@ -2027,7 +2027,7 @@ top:
 		 * function initiate recovery.
 		 */
 		nfs4args_copen_free(open_args);
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		nfs4_end_open_seqid_sync(oop);
 		open_owner_rele(oop);
 		oop = NULL;
@@ -2038,7 +2038,7 @@ top:
 			cred_otw = cr;
 			crhold(cred_otw);
 			nfs4args_copen_free(open_args);
-			(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+			xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			nfs4_end_open_seqid_sync(oop);
 			open_owner_rele(oop);
 			oop = NULL;
@@ -2052,7 +2052,7 @@ top:
 		    rnode4info(VTOR4(vp))));
 		failed_msg = "Couldn't reopen: NFSv4 error";
 		nfs4args_copen_free(open_args);
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		goto kill_file;
 	}
 
@@ -2082,7 +2082,7 @@ top:
 				    "(no expire on open) file handle changed";
 
 			nfs4args_copen_free(open_args);
-			(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+			xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			nfs_rw_exit(&mi->mi_fh_lock);
 			goto kill_file;
 
@@ -2108,7 +2108,7 @@ top:
 				    "Couldn't reopen: file handle changed"
 				    " due to mismatched fids";
 				nfs4args_copen_free(open_args);
-				(void) xdr_free(xdr_COMPOUND4res_clnt,
+				xdr_free(xdr_COMPOUND4res_clnt,
 				    (caddr_t)&res);
 				nfs_rw_exit(&mi->mi_fh_lock);
 				goto kill_file;
@@ -2149,7 +2149,7 @@ top:
 		    oop, FALSE, ep, NULL);
 		if (ep->error || ep->stat) {
 			nfs4args_copen_free(open_args);
-			(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+			xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			nfs4_end_open_seqid_sync(oop);
 			open_owner_rele(oop);
 			oop = NULL;
@@ -2181,7 +2181,7 @@ top:
 
 	nfs4_attr_cache(vp, garp, t, cr, TRUE, NULL);
 
-	(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+	xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 
 	ASSERT(nfs4_consistent_type(vp));
 
@@ -2549,12 +2549,12 @@ nfs4close_otw(rnode4_t *rp, cred_t *cred_otw, nfs4_open_owner_t *oop,
 			*recov = 0;
 
 		if (!ep->error)
-			(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+			xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		return;
 	}
 
 	if (res.status) {
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		return;
 	}
 
@@ -2596,7 +2596,7 @@ nfs4close_otw(rnode4_t *rp, cred_t *cred_otw, nfs4_open_owner_t *oop,
 	NFS4_DEBUG(nfs4_client_state_debug, (CE_NOTE, "nfs4close_otw:"
 	    " returning %d", ep->error));
 
-	(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+	xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 }
 
 /* ARGSUSED */
@@ -3268,7 +3268,7 @@ recov_retry:
 			if (!recov)
 				nfs4_end_fop(VTOMI4(vp), vp, NULL, OH_WRITE,
 				    &recov_state, needrecov);
-			(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+			xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			goto recov_retry;
 		} else if (e.error == 0 && res.status == NFS4ERR_BAD_STATEID &&
 		    sid_types.cur_sid_type == DEL_SID) {
@@ -3280,8 +3280,7 @@ recov_retry:
 				if (!recov)
 					nfs4_end_fop(mi, vp, NULL, OH_WRITE,
 					    &recov_state, needrecov);
-				(void) xdr_free(xdr_COMPOUND4res_clnt,
-				    (caddr_t)&res);
+				xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 				return (EIO);
 			}
 			if (!recov)
@@ -3291,7 +3290,7 @@ recov_retry:
 			VN_HOLD(vp);
 			nfs4delegreturn_async(rp, (NFS4_DR_PUSH|NFS4_DR_REOPEN|
 			    NFS4_DR_DISCARD), FALSE);
-			(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+			xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			goto recov_retry;
 		}
 
@@ -3307,8 +3306,7 @@ recov_retry:
 			    NULL, OP_WRITE, NULL, NULL, NULL);
 			if (!e.error) {
 				e.error = geterrno4(res.status);
-				(void) xdr_free(xdr_COMPOUND4res_clnt,
-				    (caddr_t)&res);
+				xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			}
 			nfs4_end_fop(VTOMI4(vp), vp, NULL, OH_WRITE,
 			    &recov_state, needrecov);
@@ -3319,7 +3317,7 @@ recov_retry:
 
 		if (res.status) {
 			e.error = geterrno4(res.status);
-			(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+			xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			if (!recov)
 				nfs4_end_fop(VTOMI4(vp), vp, NULL, OH_WRITE,
 				    &recov_state, needrecov);
@@ -3330,7 +3328,7 @@ recov_retry:
 		wres = &resop->nfs_resop4_u.opwrite;
 
 		if ((int)wres->count > tsize) {
-			(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+			xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 
 			zcmn_err(getzoneid(), CE_WARN,
 			    "nfs4write: server wrote %u, requested was %u",
@@ -3344,8 +3342,7 @@ recov_retry:
 			*stab_comm = UNSTABLE4;
 			if (wargs->stable == DATA_SYNC4 ||
 			    wargs->stable == FILE_SYNC4) {
-				(void) xdr_free(xdr_COMPOUND4res_clnt,
-				    (caddr_t)&res);
+				xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 				zcmn_err(getzoneid(), CE_WARN,
 				    "nfs4write: server %s did not commit "
 				    "to stable storage",
@@ -3384,7 +3381,7 @@ recov_retry:
 		gethrestime(&rp->r_attr.va_mtime);
 		rp->r_attr.va_ctime = rp->r_attr.va_mtime;
 		mutex_exit(&rp->r_statelock);
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 	} while (count);
 
 	if (!recov)
@@ -3521,19 +3518,18 @@ recov_retry:
 			nfs4_end_fop(mi, vp, NULL, OH_READ,
 			    &recov_state, needrecov);
 			if (sid_types.cur_sid_type == SPEC_SID) {
-				(void) xdr_free(xdr_COMPOUND4res_clnt,
-				    (caddr_t)&res);
+				xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 				return (EIO);
 			}
 			nfs4_save_stateid(&rargs->stateid, &sid_types);
-			(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+			xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			goto recov_retry;
 		} else if (e.error == 0 && res.status == NFS4ERR_OLD_STATEID &&
 		    !async && sid_types.cur_sid_type != SPEC_SID) {
 			nfs4_save_stateid(&rargs->stateid, &sid_types);
 			nfs4_end_fop(mi, vp, NULL, OH_READ,
 			    &recov_state, needrecov);
-			(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+			xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			goto recov_retry;
 		} else if (e.error == 0 && res.status == NFS4ERR_BAD_STATEID &&
 		    sid_types.cur_sid_type == DEL_SID) {
@@ -3544,8 +3540,7 @@ recov_retry:
 			if (nfs4rdwr_check_osid(vp, &e, cr)) {
 				nfs4_end_fop(mi, vp, NULL, OH_READ,
 				    &recov_state, needrecov);
-				(void) xdr_free(xdr_COMPOUND4res_clnt,
-				    (caddr_t)&res);
+				xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 				return (EIO);
 			}
 			nfs4_end_fop(mi, vp, NULL, OH_READ,
@@ -3554,7 +3549,7 @@ recov_retry:
 			VN_HOLD(vp);
 			nfs4delegreturn_async(rp, (NFS4_DR_PUSH|NFS4_DR_REOPEN|
 			    NFS4_DR_DISCARD), FALSE);
-			(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+			xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			goto recov_retry;
 		}
 		if (needrecov) {
@@ -3583,15 +3578,13 @@ recov_retry:
 				 * stale (server reboot).
 				 */
 				nfs4_init_stateid_types(&sid_types);
-				(void) xdr_free(xdr_COMPOUND4res_clnt,
-				    (caddr_t)&res);
+				xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 				goto recov_retry;
 			}
 
 			if (!e.error) {
 				e.error = geterrno4(res.status);
-				(void) xdr_free(xdr_COMPOUND4res_clnt,
-				    (caddr_t)&res);
+				xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			}
 			return (e.error);
 		}
@@ -3600,7 +3593,7 @@ recov_retry:
 			e.error = geterrno4(res.status);
 			nfs4_end_fop(mi, vp, NULL, OH_READ,
 			    &recov_state, needrecov);
-			(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+			xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			return (e.error);
 		}
 
@@ -3617,7 +3610,7 @@ recov_retry:
 		}
 		lwp_stat_update(LWP_STAT_INBLK, 1);
 		is_eof = res.array[1].nfs_resop4_u.opread.eof;
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 
 	} while (count && !is_eof);
 
@@ -4007,7 +4000,7 @@ recov_retry:
 				nfs4args_verify_free(&argop[verify_argop]);
 				verify_argop = -1;
 			}
-			(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+			xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			goto recov_retry;
 		}
 
@@ -4034,8 +4027,7 @@ recov_retry:
 					    OP_SETATTR);
 
 				e.error = geterrno4(res.status);
-				(void) xdr_free(xdr_COMPOUND4res_clnt,
-				    (caddr_t)&res);
+				xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			}
 			nfs4_fattr4_free(&argop[setattr_argop].nfs_argop4_u.
 			    opsetattr.obj_attributes);
@@ -4105,7 +4097,7 @@ recov_retry:
 			 * retry with a new verify value
 			 */
 			ctime = garp->n4g_va.va_ctime;
-			(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+			xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			resp = NULL;
 		}
 		if (!e.error) {
@@ -4115,7 +4107,7 @@ recov_retry:
 				nfs4args_verify_free(&argop[verify_argop]);
 				verify_argop = -1;
 			}
-			(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+			xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			goto do_again;
 		}
 	} while (!e.error);
@@ -4131,7 +4123,7 @@ recov_retry:
 			verify_argop = -1;
 		}
 		if (resp)
-			(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)resp);
+			xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)resp);
 		return (e.error);
 	}
 
@@ -4220,7 +4212,7 @@ recov_retry:
 		nfs4args_verify_free(&argop[verify_argop]);
 		verify_argop = -1;
 	}
-	(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+	xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 
 	/*
 	 * Some servers will change the mode to clear the setuid
@@ -4412,8 +4404,7 @@ recov_retry:
 			nfs4_end_fop(VTOMI4(vp), vp, NULL, OH_ACCESS,
 			    &recov_state, needrecov);
 			if (!e.error)
-				(void) xdr_free(xdr_COMPOUND4res_clnt,
-				    (caddr_t)&res);
+				xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			goto recov_retry;
 		}
 	}
@@ -4463,8 +4454,7 @@ recov_retry:
 			 */
 			/* XXX-LP */
 			if (ncr != NULL) {
-				(void) xdr_free(xdr_COMPOUND4res_clnt,
-				    (caddr_t)&res);
+				xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 				cred = ncr;
 				ncr = NULL;
 				goto tryagain;
@@ -4475,7 +4465,7 @@ recov_retry:
 
 out:
 	if (!rpc_error)
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 
 	if (ncrfree != NULL)
 		crfree(ncrfree);
@@ -4567,8 +4557,7 @@ recov_retry:
 		if (nfs4_start_recovery(&e, VTOMI4(vp), vp, NULL, NULL,
 		    NULL, OP_READLINK, NULL, NULL, NULL) == FALSE) {
 			if (!e.error)
-				(void) xdr_free(xdr_COMPOUND4res_clnt,
-				    (caddr_t)&res);
+				xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 
 			nfs4_end_op(VTOMI4(vp), vp, NULL, &recov_state,
 			    needrecov);
@@ -4594,7 +4583,7 @@ recov_retry:
 		 */
 		e.error = geterrno4(res.status);
 		nfs4_purge_stale_fh(e.error, vp, cr);
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		return (e.error);
 	}
 
@@ -4630,7 +4619,7 @@ recov_retry:
 	}
 	e.error = nfs4_update_attrcache(res.status, garp, t, vp, cr);
 
-	(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+	xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 
 	/*
 	 * The over the wire error for attempting to readlink something
@@ -4928,8 +4917,7 @@ recov_retry_remove:
 		if (nfs4_start_recovery(&e, VTOMI4(unldvp), unldvp, NULL,
 		    NULL, NULL, OP_REMOVE, NULL, NULL, NULL) == FALSE) {
 			if (!e.error)
-				(void) xdr_free(xdr_COMPOUND4res_clnt,
-				    (caddr_t)&res);
+				xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			nfs4_end_op(VTOMI4(unldvp), unldvp, NULL,
 			    &recov_state, TRUE);
 			goto recov_retry_remove;
@@ -4942,7 +4930,7 @@ recov_retry_remove:
 	 */
 	VN_RELE(unldvp);
 	if (!e.error && resp)
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)resp);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)resp);
 
 	kmem_free(unlname, MAXNAMELEN);
 	crfree(unlcred);
@@ -5351,7 +5339,7 @@ recov_retry:
 			VN_RELE(*vpp);
 		nfs4_end_fop(mi, dvp, NULL, OH_LOOKUP,
 		    &recov_state, FALSE);
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		kmem_free(argop, argoplist_size);
 		return (e.error);
 	}
@@ -5372,7 +5360,7 @@ recov_retry:
 			else
 				nfs4_end_fop(mi, dvp, NULL, OH_LOOKUP,
 				    &recov_state, TRUE);
-			(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+			xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			kmem_free(argop, argoplist_size);
 			if (!e.error)
 				goto recov_retry;
@@ -5387,7 +5375,7 @@ recov_retry:
 			nfs4_end_fop(mi, dvp, NULL, OH_LOOKUP,
 			    &recov_state, TRUE);
 
-			(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+			xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			kmem_free(argop, argoplist_size);
 			goto recov_retry;
 		}
@@ -5643,7 +5631,7 @@ recov_retry:
 	}
 
 exit:
-	(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+	xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 	kmem_free(argop, argoplist_size);
 	(void) check_mnt_secinfo(mi->mi_curr_serv, nvp);
 	return (e.error);
@@ -5789,7 +5777,7 @@ recov_retry:
 			VN_RELE(*vpp);
 		nfs4_end_fop(mi, dvp, NULL, OH_LOOKUP,
 		    &recov_state, FALSE);
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		kmem_free(argop, argoplist_size);
 		return (e.error);
 	}
@@ -5810,7 +5798,7 @@ recov_retry:
 			else
 				nfs4_end_fop(mi, dvp, NULL, OH_LOOKUP,
 				    &recov_state, TRUE);
-			(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+			xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			kmem_free(argop, argoplist_size);
 			if (!e.error)
 				goto recov_retry;
@@ -5823,7 +5811,7 @@ recov_retry:
 			nfs4_end_fop(mi, dvp, NULL, OH_LOOKUP,
 			    &recov_state, TRUE);
 
-			(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+			xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			kmem_free(argop, argoplist_size);
 			goto recov_retry;
 		}
@@ -6048,7 +6036,7 @@ recov_retry:
 	*vpp = nvp;
 
 exit:
-	(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+	xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 	kmem_free(argop, argoplist_size);
 	(void) check_mnt_secinfo(mi->mi_curr_serv, nvp);
 	return (e.error);
@@ -6429,7 +6417,7 @@ recov_retry:
 		nfs4_end_op(VTOMI4(dvp), dvp, NULL, &recov_state, needrecov);
 		if (!e.error) {
 			e.error = geterrno4(res.status);
-			(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+			xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		}
 		if (abort == FALSE)
 			goto recov_retry;
@@ -6463,7 +6451,7 @@ recov_retry:
 		}
 
 		if (e.error) {
-			(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+			xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			nfs4_end_op(VTOMI4(dvp), dvp, NULL, &recov_state,
 			    needrecov);
 			return (e.error);
@@ -6480,7 +6468,7 @@ recov_retry:
 	gf_res = &resop->nfs_resop4_u.opgetfh;
 	if (gf_res->object.nfs_fh4_len == 0) {
 		*avp = NULL;
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		nfs4_end_op(VTOMI4(dvp), dvp, NULL, &recov_state, needrecov);
 		return (ENOENT);
 	}
@@ -6518,7 +6506,7 @@ recov_retry:
 
 	nfs4_end_op(VTOMI4(dvp), dvp, NULL, &recov_state, needrecov);
 
-	(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+	xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 
 	return (0);
 }
@@ -7050,7 +7038,7 @@ recov_retry:
 				nfs4args_verify_free(&argop[8]);
 				nfs4args_setattr_free(&argop[9]);
 			}
-			(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+			xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			goto recov_retry;
 		}
 	}
@@ -7152,7 +7140,7 @@ out:
 		nfs4args_setattr_free(&argop[9]);
 	}
 	if (resp)
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)resp);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)resp);
 	if (need_end_op)
 		nfs4_end_op(mi, dvp, NULL, &recov_state, needrecov);
 
@@ -7402,8 +7390,7 @@ recov_retry:
 		if (nfs4_start_recovery(&e, VTOMI4(dvp), dvp,
 		    NULL, NULL, NULL, OP_REMOVE, NULL, NULL, NULL) == FALSE) {
 			if (!e.error)
-				(void) xdr_free(xdr_COMPOUND4res_clnt,
-				    (caddr_t)&res);
+				xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			nfs4_end_op(VTOMI4(dvp), dvp, NULL, &recov_state,
 			    needrecov);
 			goto recov_retry;
@@ -7441,7 +7428,7 @@ recov_retry:
 	}
 	nfs_rw_exit(&drp->r_rwlock);
 	if (resp)
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)resp);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)resp);
 
 	if (e.error == 0) {
 		vnode_t *tvp;
@@ -7580,8 +7567,7 @@ recov_retry:
 			    needrecov);
 			kmem_free(argop, argoplist_size);
 			if (!e.error)
-				(void) xdr_free(xdr_COMPOUND4res_clnt,
-				    (caddr_t)&res);
+				xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			goto recov_retry;
 		} else {
 			if (e.error != 0) {
@@ -7678,7 +7664,7 @@ recov_retry:
 out:
 	kmem_free(argop, argoplist_size);
 	if (resp)
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)resp);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)resp);
 
 	nfs_rw_exit(&tdrp->r_rwlock);
 
@@ -8245,8 +8231,7 @@ recov_retry:
 		    OP_RENAME, NULL, NULL, NULL) == FALSE) {
 			nfs4_end_op(mi, odvp, ndvp, &recov_state, needrecov);
 			if (!e.error)
-				(void) xdr_free(xdr_COMPOUND4res_clnt,
-				    (caddr_t)&res);
+				xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			goto recov_retry;
 		}
 	}
@@ -8310,7 +8295,7 @@ recov_retry:
 	}
 
 	if (resp)
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)resp);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)resp);
 	nfs4_end_op(mi, odvp, ndvp, &recov_state, needrecov);
 	kmem_free(argop, argoplist_size);
 
@@ -8505,8 +8490,7 @@ recov_retry:
 			    &recov_state, needrecov);
 			kmem_free(argop, argoplist_size);
 			if (!e.error)
-				(void) xdr_free(xdr_COMPOUND4res_clnt,
-				    (caddr_t)&res);
+				xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			mutex_enter(&orp->r_statelock);
 			orp->r_flags &= ~R4RECEXPFH;
 			cv_broadcast(&orp->r_cv);
@@ -8604,7 +8588,7 @@ recov_retry:
 out:
 	kmem_free(argop, argoplist_size);
 	if (resp)
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)resp);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)resp);
 	mutex_enter(&orp->r_statelock);
 	orp->r_flags &= ~R4RECEXPFH;
 	cv_broadcast(&orp->r_cv);
@@ -8779,8 +8763,7 @@ recov_retry:
 		if (nfs4_start_recovery(&e, VTOMI4(dvp), dvp, NULL, NULL,
 		    NULL, OP_REMOVE, NULL, NULL, NULL) == FALSE) {
 			if (!e.error)
-				(void) xdr_free(xdr_COMPOUND4res_clnt,
-				    (caddr_t)&res);
+				xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 
 			nfs4_end_op(VTOMI4(dvp), dvp, NULL, &recov_state,
 			    needrecov);
@@ -8840,7 +8823,7 @@ recov_retry:
 	nfs_rw_exit(&drp->r_rwlock);
 
 	if (resp)
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)resp);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)resp);
 
 	if (e.error == 0) {
 		vnode_t *tvp;
@@ -9379,8 +9362,7 @@ recov_retry:
 			nfs4_end_fop(VTOMI4(vp), vp, NULL, OH_READDIR,
 			    &recov_state, needrecov);
 			if (!e.error)
-				(void) xdr_free(xdr_COMPOUND4res_clnt,
-				    (caddr_t)&res);
+				xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			if (rdc->entries != NULL) {
 				kmem_free(rdc->entries, rdc->entlen);
 				rdc->entries = NULL;
@@ -9425,7 +9407,7 @@ recov_retry:
 			    &recov_state, needrecov);
 			nfs4_purge_stale_fh(e.error, vp, cr);
 			rdc->error = e.error;
-			(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+			xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			if (rdc->entries != NULL) {
 				kmem_free(rdc->entries, rdc->entlen);
 				rdc->entries = NULL;
@@ -9513,7 +9495,7 @@ recov_retry:
 		mutex_exit(&mi->mi_lock);
 	}
 
-	(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+	xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 
 out:
 	/*
@@ -11810,8 +11792,7 @@ recov_retry:
 			nfs4_end_fop(VTOMI4(vp), vp, NULL, OH_COMMIT,
 			    &recov_state, needrecov);
 			if (!e.error)
-				(void) xdr_free(xdr_COMPOUND4res_clnt,
-				    (caddr_t)&res);
+				xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			goto recov_retry;
 		}
 		if (e.error) {
@@ -11831,7 +11812,7 @@ recov_retry:
 			crfree(cred_otw);
 			nfs4_end_fop(VTOMI4(vp), vp, NULL, OH_COMMIT,
 			    &recov_state, needrecov);
-			(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+			xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			goto get_commit_cred;
 		}
 		/*
@@ -11861,7 +11842,7 @@ recov_retry:
 		mutex_enter(&rp->r_statelock);
 		if (cm_res->writeverf == rp->r_writeverf) {
 			mutex_exit(&rp->r_statelock);
-			(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+			xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			nfs4_end_fop(VTOMI4(vp), vp, NULL, OH_COMMIT,
 			    &recov_state, needrecov);
 			crfree(cred_otw);
@@ -11875,7 +11856,7 @@ recov_retry:
 		e.error = NFS_VERF_MISMATCH;
 	}
 
-	(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+	xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 	nfs4_end_fop(VTOMI4(vp), vp, NULL, OH_COMMIT, &recov_state, needrecov);
 	crfree(cred_otw);
 	if (osp != NULL)
@@ -12796,8 +12777,7 @@ recov_retry_confirm:
 		    res.status == NFS4ERR_RESOURCE) &&
 		    abort == FALSE && resend == FALSE) {
 			if (!ep->error)
-				(void) xdr_free(xdr_COMPOUND4res_clnt,
-				    (caddr_t)&res);
+				xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 
 			delay(SEC_TO_TICK(confirm_retry_sec));
 			goto recov_retry_confirm;
@@ -12808,12 +12788,12 @@ recov_retry_confirm:
 		else
 			*retry_open = FALSE;
 		if (!ep->error)
-			(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+			xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		return;
 	}
 
 	if (res.status) {
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		return;
 	}
 
@@ -12821,7 +12801,7 @@ recov_retry_confirm:
 	bcopy(&resop->nfs_resop4_u.opopen_confirm.open_stateid,
 	    stateid, sizeof (*stateid));
 
-	(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+	xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 }
 
 /*
@@ -13618,7 +13598,7 @@ nfs4frlock_check_access(vnode_t *vp, nfs4_op_hint_t op_hint,
 		nfs4args_lockt_free(&argop[1]);
 	kmem_free(argop, 2 * sizeof (nfs_argop4));
 	if (!error)
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)*respp);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)*respp);
 	*argspp = NULL;
 	*respp = NULL;
 
@@ -13746,7 +13726,7 @@ nfs4frlock_recovery(int needrecov, nfs4_error_t *ep,
 			nfs4args_lockt_free(&argop[1]);
 		kmem_free(argop, 2 * sizeof (nfs_argop4));
 		if (!ep->error)
-			(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)*respp);
+			xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)*respp);
 		*respp = NULL;
 		*argspp = NULL;
 	}
@@ -13849,7 +13829,7 @@ nfs4frlock_results_denied(nfs4_lock_call_type_t ctype, LOCK4args *lock_args,
 				nfs4args_lockt_free(&argop[1]);
 			kmem_free(argop, 2 * sizeof (nfs_argop4));
 			if (*respp)
-				(void) xdr_free(xdr_COMPOUND4res_clnt,
+				xdr_free(xdr_COMPOUND4res_clnt,
 				    (caddr_t)*respp);
 			*argspp = NULL;
 			*respp = NULL;
@@ -14073,7 +14053,7 @@ nfs4frlock_final_cleanup(nfs4_lock_call_type_t ctype, COMPOUND4args_clnt *argsp,
 			nfs4args_lockt_free(&argop[1]);
 		kmem_free(argop, 2 * sizeof (nfs_argop4));
 		if (resp)
-			(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)resp);
+			xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)resp);
 	}
 
 	/* free the reference on the lock owner */