Deleted Added
full compact
37c37
< * $Id: nfs.h,v 1.33 1998/02/01 21:23:29 bde Exp $
---
> * $Id: nfs.h,v 1.34 1998/03/30 09:53:43 phk Exp $
59c59
< #define NFS_MINATTRTIMO 5 /* Attribute cache timeout in sec */
---
> #define NFS_MINATTRTIMO 3 /* VREG attrib cache timeout in sec */
63a64,69
> #ifndef NFS_MINDIRATTRTIMO
> #define NFS_MINDIRATTRTIMO 30 /* VDIR attrib cache timeout in sec */
> #endif
> #ifndef NFS_MAXDIRATTRTIMO
> #define NFS_MAXDIRATTRTIMO 60
> #endif
107,115d112
< * Set the attribute timeout based on how recently the file has been modified.
< */
< #define NFS_ATTRTIMEO(np) \
< ((((np)->n_flag & NMODIFIED) || \
< (time_second - (np)->n_mtime) / 10 < NFS_MINATTRTIMO) ? NFS_MINATTRTIMO : \
< ((time_second - (np)->n_mtime) / 10 > NFS_MAXATTRTIMO ? NFS_MAXATTRTIMO : \
< (time_second - (np)->n_mtime) / 10))
<
< /*
151a149,152
> int acregmin; /* cache attrs for reg files min time */
> int acregmax; /* cache attrs for reg files max time */
> int acdirmin; /* cache attrs for dirs min time */
> int acdirmax; /* cache attrs for dirs max time */
175,189c176,179
< #define NFSMNT_INTERNAL 0xfffc0000 /* Bits set internally */
< #define NFSMNT_HASWRITEVERF 0x00040000 /* Has write verifier for V3 */
< #define NFSMNT_GOTPATHCONF 0x00080000 /* Got the V3 pathconf info */
< #define NFSMNT_GOTFSINFO 0x00100000 /* Got the V3 fsinfo */
< #define NFSMNT_MNTD 0x00200000 /* Mnt server for mnt point */
< #define NFSMNT_DISMINPROG 0x00400000 /* Dismount in progress */
< #define NFSMNT_DISMNT 0x00800000 /* Dismounted */
< #define NFSMNT_SNDLOCK 0x01000000 /* Send socket lock */
< #define NFSMNT_WANTSND 0x02000000 /* Want above */
< #define NFSMNT_RCVLOCK 0x04000000 /* Rcv socket lock */
< #define NFSMNT_WANTRCV 0x08000000 /* Want above */
< #define NFSMNT_WAITAUTH 0x10000000 /* Wait for authentication */
< #define NFSMNT_HASAUTH 0x20000000 /* Has authenticator */
< #define NFSMNT_WANTAUTH 0x40000000 /* Wants an authenticator */
< #define NFSMNT_AUTHERR 0x80000000 /* Authentication error */
---
> #define NFSMNT_ACREGMIN 0x00040000
> #define NFSMNT_ACREGMAX 0x00080000
> #define NFSMNT_ACDIRMIN 0x00100000
> #define NFSMNT_ACDIRMAX 0x00200000
190a181,195
> #define NFSSTA_HASWRITEVERF 0x00040000 /* Has write verifier for V3 */
> #define NFSSTA_GOTPATHCONF 0x00080000 /* Got the V3 pathconf info */
> #define NFSSTA_GOTFSINFO 0x00100000 /* Got the V3 fsinfo */
> #define NFSSTA_MNTD 0x00200000 /* Mnt server for mnt point */
> #define NFSSTA_DISMINPROG 0x00400000 /* Dismount in progress */
> #define NFSSTA_DISMNT 0x00800000 /* Dismounted */
> #define NFSSTA_SNDLOCK 0x01000000 /* Send socket lock */
> #define NFSSTA_WANTSND 0x02000000 /* Want above */
> #define NFSSTA_RCVLOCK 0x04000000 /* Rcv socket lock */
> #define NFSSTA_WANTRCV 0x08000000 /* Want above */
> #define NFSSTA_WAITAUTH 0x10000000 /* Wait for authentication */
> #define NFSSTA_HASAUTH 0x20000000 /* Has authenticator */
> #define NFSSTA_WANTAUTH 0x40000000 /* Wants an authenticator */
> #define NFSSTA_AUTHERR 0x80000000 /* Authentication error */
>
583,584c588,589
< int nfs_sndlock __P((int *, struct nfsreq *));
< void nfs_sndunlock __P((int *flagp));
---
> int nfs_sndlock __P((int *, int *, struct nfsreq *));
> void nfs_sndunlock __P((int *, int *));