diff options
author | jhb <jhb@FreeBSD.org> | 2010-08-20 19:46:50 +0000 |
---|---|---|
committer | jhb <jhb@FreeBSD.org> | 2010-08-20 19:46:50 +0000 |
commit | d4890c88b0febe402398e0a0bb66efdc998dd9c9 (patch) | |
tree | 9899b196d40cbc0b664fe2238a340bf770b2bd81 /sys/fs/nwfs | |
parent | a9738fb2b395d0c304c9a1fcf56a05f4143d9afb (diff) | |
download | FreeBSD-src-d4890c88b0febe402398e0a0bb66efdc998dd9c9.zip FreeBSD-src-d4890c88b0febe402398e0a0bb66efdc998dd9c9.tar.gz |
Add dedicated routines to toggle lockmgr flags such as LK_NOSHARE and
LK_CANRECURSE after a lock is created. Use them to implement macros that
otherwise manipulated the flags directly. Assert that the associated
lockmgr lock is exclusively locked by the current thread when manipulating
these flags to ensure the flag updates are safe. This last change required
some minor shuffling in a few filesystems to exclusively lock a brand new
vnode slightly earlier.
Reviewed by: kib
MFC after: 3 days
Diffstat (limited to 'sys/fs/nwfs')
-rw-r--r-- | sys/fs/nwfs/nwfs_node.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/fs/nwfs/nwfs_node.c b/sys/fs/nwfs/nwfs_node.c index fc9b41b..cf6f6d9 100644 --- a/sys/fs/nwfs/nwfs_node.c +++ b/sys/fs/nwfs/nwfs_node.c @@ -185,7 +185,6 @@ rescan: if (dvp) { np->n_parent = VTONW(dvp)->n_fid; } - VN_LOCK_AREC(vp); sx_xlock(&nwhashlock); /* * Another process can create vnode while we blocked in malloc() or @@ -202,6 +201,7 @@ rescan: nhpp = NWNOHASH(fid); LIST_INSERT_HEAD(nhpp, np, n_hash); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); + VN_LOCK_AREC(vp); sx_xunlock(&nwhashlock); ASSERT_VOP_LOCKED(dvp, "nwfs_allocvp"); |