diff options
| author | Rick Macklem <rmacklem@FreeBSD.org> | 2009-09-09 20:37:49 +0000 |
|---|---|---|
| committer | Rick Macklem <rmacklem@FreeBSD.org> | 2009-09-09 20:37:49 +0000 |
| commit | 8f63187ec137a8a90529976d662c0dbab9f5ecd5 (patch) | |
| tree | ccf1c756af1d81638dd057a40135788ecb411f08 /sys/nfsclient | |
| parent | 469c3a5ff424bb8b0f2806a2b7e1b136cd11d9a7 (diff) | |
| download | src-8f63187ec137a8a90529976d662c0dbab9f5ecd5.tar.gz src-8f63187ec137a8a90529976d662c0dbab9f5ecd5.zip | |
Add LK_NOWITNESS to the vn_lock() calls done on newly created nfs
vnodes, since these nodes are not linked into the mount queue and,
as such, the vn_lock() cannot cause a deadlock so LORs are harmless.
Suggested by: kib
Approved by: kib (mentor)
MFC after: 3 days
Notes
Notes:
svn path=/head/; revision=197048
Diffstat (limited to 'sys/nfsclient')
| -rw-r--r-- | sys/nfsclient/nfs_node.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/nfsclient/nfs_node.c b/sys/nfsclient/nfs_node.c index f5361277f552..522bc445c19c 100644 --- a/sys/nfsclient/nfs_node.c +++ b/sys/nfsclient/nfs_node.c @@ -158,7 +158,7 @@ nfs_nget(struct mount *mntp, nfsfh_t *fhp, int fhsize, struct nfsnode **npp, int np->n_fhp = &np->n_fh; bcopy((caddr_t)fhp, (caddr_t)np->n_fhp, fhsize); np->n_fhsize = fhsize; - lockmgr(vp->v_vnlock, LK_EXCLUSIVE, NULL); + lockmgr(vp->v_vnlock, LK_EXCLUSIVE | LK_NOWITNESS, NULL); error = insmntque(vp, mntp); if (error != 0) { *npp = NULL; |