mirror of
https://git.FreeBSD.org/src.git
synced 2025-01-01 12:19:28 +00:00
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index 7c243b6..0bdaf36 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -279,6 +279,7 @@ SYSCTL_INT(_debug, OID_AUTO, vnlru_nowhere, CTLFLAG_RW, #define VSHOULDFREE(vp) (!((vp)->v_iflag & VI_FREE) && !(vp)->v_holdcnt) #define VSHOULDBUSY(vp) (((vp)->v_iflag & VI_FREE) && (vp)->v_holdcnt) +static int vnsz2log; /* * Initialize the vnode management data structures. @@ -293,6 +294,7 @@ SYSCTL_INT(_debug, OID_AUTO, vnlru_nowhere, CTLFLAG_RW, static void vntblinit(void *dummy __unused) { + u_int i; int physvnodes, virtvnodes; /* @@ -332,6 +334,9 @@ vntblinit(void *dummy __unused) syncer_maxdelay = syncer_mask + 1; mtx_init(&sync_mtx, "Syncer mtx", NULL, MTX_DEF); cv_init(&sync_wakeup, "syncer"); + for (i = 1; i <= sizeof(struct vnode); i <<= 1) + vnsz2log++; + vnsz2log--; } SYSINIT(vfs, SI_SUB_VFS, SI_ORDER_FIRST, vntblinit, NULL); @@ -1067,6 +1072,14 @@ alloc: } rangelock_init(&vp->v_rl); + /* + * For the filesystems which do not use vfs_hash_insert(), + * still initialize v_hash to have vfs_hash_index() useful. + * E.g., nullfs uses vfs_hash_index() on the lower vnode for + * its own hashing. + */ + vp->v_hash = (uintptr_t)vp >> vnsz2log; + *vpp = vp; return (0); }
This commit is contained in:
parent
f6af8e375c
commit
a41df84820
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=245407
@ -279,6 +279,7 @@ SYSCTL_INT(_debug, OID_AUTO, vnlru_nowhere, CTLFLAG_RW,
|
||||
#define VSHOULDFREE(vp) (!((vp)->v_iflag & VI_FREE) && !(vp)->v_holdcnt)
|
||||
#define VSHOULDBUSY(vp) (((vp)->v_iflag & VI_FREE) && (vp)->v_holdcnt)
|
||||
|
||||
static int vnsz2log;
|
||||
|
||||
/*
|
||||
* Initialize the vnode management data structures.
|
||||
@ -293,6 +294,7 @@ SYSCTL_INT(_debug, OID_AUTO, vnlru_nowhere, CTLFLAG_RW,
|
||||
static void
|
||||
vntblinit(void *dummy __unused)
|
||||
{
|
||||
u_int i;
|
||||
int physvnodes, virtvnodes;
|
||||
|
||||
/*
|
||||
@ -332,6 +334,9 @@ vntblinit(void *dummy __unused)
|
||||
syncer_maxdelay = syncer_mask + 1;
|
||||
mtx_init(&sync_mtx, "Syncer mtx", NULL, MTX_DEF);
|
||||
cv_init(&sync_wakeup, "syncer");
|
||||
for (i = 1; i <= sizeof(struct vnode); i <<= 1)
|
||||
vnsz2log++;
|
||||
vnsz2log--;
|
||||
}
|
||||
SYSINIT(vfs, SI_SUB_VFS, SI_ORDER_FIRST, vntblinit, NULL);
|
||||
|
||||
@ -1067,6 +1072,14 @@ getnewvnode(const char *tag, struct mount *mp, struct vop_vector *vops,
|
||||
}
|
||||
rangelock_init(&vp->v_rl);
|
||||
|
||||
/*
|
||||
* For the filesystems which do not use vfs_hash_insert(),
|
||||
* still initialize v_hash to have vfs_hash_index() useful.
|
||||
* E.g., nullfs uses vfs_hash_index() on the lower vnode for
|
||||
* its own hashing.
|
||||
*/
|
||||
vp->v_hash = (uintptr_t)vp >> vnsz2log;
|
||||
|
||||
*vpp = vp;
|
||||
return (0);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user