37c37
< * $Id: nfs_syscalls.c,v 1.36 1998/02/09 06:10:37 eivind Exp $
---
> * $Id: nfs_syscalls.c,v 1.37 1998/03/30 09:54:17 phk Exp $
226c226
< if ((nmp->nm_flag & NFSMNT_MNTD) &&
---
> if ((nmp->nm_state & NFSSTA_MNTD) &&
229c229
< nmp->nm_flag |= NFSMNT_MNTD;
---
> nmp->nm_state |= NFSSTA_MNTD;
516a517
> &slp->ns_solock,
520c521,522
< nfs_sndunlock(&slp->ns_solock);
---
> nfs_sndunlock(&slp->ns_solock,
> &slp->ns_solock);
680c682,683
< (void) nfs_sndlock(solockp, (struct nfsreq *)0);
---
> (void) nfs_sndlock(solockp, solockp,
> (struct nfsreq *)0);
696c699
< nfs_sndunlock(solockp);
---
> nfs_sndunlock(solockp, solockp);
902,903c905,906
< while ((nmp->nm_flag & NFSMNT_WAITAUTH) == 0) {
< nmp->nm_flag |= NFSMNT_WANTAUTH;
---
> while ((nmp->nm_state & NFSSTA_WAITAUTH) == 0) {
> nmp->nm_state |= NFSSTA_WANTAUTH;
908c911
< nmp->nm_flag &= ~NFSMNT_WANTAUTH;
---
> nmp->nm_state &= ~NFSSTA_WANTAUTH;
912c915
< nmp->nm_flag &= ~(NFSMNT_WAITAUTH | NFSMNT_WANTAUTH);
---
> nmp->nm_state &= ~(NFSSTA_WAITAUTH | NFSSTA_WANTAUTH);
923c926
< while ((nmp->nm_flag & NFSMNT_HASAUTH) == 0 && error == 0) {
---
> while ((nmp->nm_state & NFSSTA_HASAUTH) == 0 && error == 0) {
928,929c931,932
< if (nmp->nm_flag & NFSMNT_AUTHERR) {
< nmp->nm_flag &= ~NFSMNT_AUTHERR;
---
> if (nmp->nm_state & NFSSTA_AUTHERR) {
> nmp->nm_state &= ~NFSSTA_AUTHERR;
939,942c942,945
< nmp->nm_flag &= ~NFSMNT_HASAUTH;
< nmp->nm_flag |= NFSMNT_WAITAUTH;
< if (nmp->nm_flag & NFSMNT_WANTAUTH) {
< nmp->nm_flag &= ~NFSMNT_WANTAUTH;
---
> nmp->nm_state &= ~NFSSTA_HASAUTH;
> nmp->nm_state |= NFSSTA_WAITAUTH;
> if (nmp->nm_state & NFSSTA_WANTAUTH) {
> nmp->nm_state &= ~NFSSTA_WANTAUTH;