diff options
Diffstat (limited to 'sys/fs/nfs/nfsrvstate.h')
| -rw-r--r-- | sys/fs/nfs/nfsrvstate.h | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/sys/fs/nfs/nfsrvstate.h b/sys/fs/nfs/nfsrvstate.h index 972fffe..6d32244 100644 --- a/sys/fs/nfs/nfsrvstate.h +++ b/sys/fs/nfs/nfsrvstate.h @@ -48,23 +48,22 @@ LIST_HEAD(nfssessionhashhead, nfsdsession); /* * List head for nfsusrgrp. */ -LIST_HEAD(nfsuserhashhead, nfsusrgrp); -TAILQ_HEAD(nfsuserlruhead, nfsusrgrp); +TAILQ_HEAD(nfsuserhashhead, nfsusrgrp); #define NFSCLIENTHASH(id) \ (&nfsclienthash[(id).lval[1] % nfsrv_clienthashsize]) #define NFSSTATEHASH(clp, id) \ (&((clp)->lc_stateid[(id).other[2] % nfsrv_statehashsize])) #define NFSUSERHASH(id) \ - (&nfsuserhash[(id) % NFSUSERHASHSIZE]) + (&nfsuserhash[(id) % nfsrv_lughashsize]) #define NFSUSERNAMEHASH(p, l) \ (&nfsusernamehash[((l)>=4?(*(p)+*((p)+1)+*((p)+2)+*((p)+3)):*(p)) \ - % NFSUSERHASHSIZE]) + % nfsrv_lughashsize]) #define NFSGROUPHASH(id) \ - (&nfsgrouphash[(id) % NFSGROUPHASHSIZE]) + (&nfsgrouphash[(id) % nfsrv_lughashsize]) #define NFSGROUPNAMEHASH(p, l) \ (&nfsgroupnamehash[((l)>=4?(*(p)+*((p)+1)+*((p)+2)+*((p)+3)):*(p)) \ - % NFSGROUPHASHSIZE]) + % nfsrv_lughashsize]) struct nfssessionhash { struct mtx mtx; @@ -264,14 +263,14 @@ struct nfslockfile { * names. */ struct nfsusrgrp { - TAILQ_ENTRY(nfsusrgrp) lug_lru; /* LRU list */ - LIST_ENTRY(nfsusrgrp) lug_numhash; /* Hash by id# */ - LIST_ENTRY(nfsusrgrp) lug_namehash; /* and by name */ + TAILQ_ENTRY(nfsusrgrp) lug_numhash; /* Hash by id# */ + TAILQ_ENTRY(nfsusrgrp) lug_namehash; /* and by name */ time_t lug_expiry; /* Expiry time in sec */ union { uid_t un_uid; /* id# */ gid_t un_gid; } lug_un; + struct ucred *lug_cred; /* Cred. with groups list */ int lug_namelen; /* Name length */ u_char lug_name[1]; /* malloc'd correct length */ }; |
