summaryrefslogtreecommitdiff
path: root/usr/src/uts/common/fs/nfs/nfs4_vnops.c
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src/uts/common/fs/nfs/nfs4_vnops.c')
-rw-r--r--usr/src/uts/common/fs/nfs/nfs4_vnops.c202
1 files changed, 91 insertions, 111 deletions
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 */