diff options
| author | attilio <attilio@FreeBSD.org> | 2008-02-24 16:38:58 +0000 |
|---|---|---|
| committer | attilio <attilio@FreeBSD.org> | 2008-02-24 16:38:58 +0000 |
| commit | 0d54671a48443b15ac601a80e192bc4c8faed7f9 (patch) | |
| tree | 997840c8acf28b15394b97f1d05d64f78bf81fd6 /sys/nfsclient | |
| parent | 1c8346475e6e9a892928e5197425bb703eba2930 (diff) | |
| download | FreeBSD-src-0d54671a48443b15ac601a80e192bc4c8faed7f9.zip FreeBSD-src-0d54671a48443b15ac601a80e192bc4c8faed7f9.tar.gz | |
Introduce some functions in the vnode locks namespace and in the ffs
namespace in order to handle lockmgr fields in a controlled way instead
than spreading all around bogus stubs:
- VN_LOCK_AREC() allows lock recursion for a specified vnode
- VN_LOCK_ASHARE() allows lock sharing for a specified vnode
In FFS land:
- BUF_AREC() allows lock recursion for a specified buffer lock
- BUF_NOREC() disallows recursion for a specified buffer lock
Side note: union_subr.c::unionfs_node_update() is the only other function
directly handling lockmgr fields. As this is not simple to fix, it has
been left behind as "sole" exception.
Diffstat (limited to 'sys/nfsclient')
| -rw-r--r-- | sys/nfsclient/nfs_node.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/nfsclient/nfs_node.c b/sys/nfsclient/nfs_node.c index 4f13a77..7876d32 100644 --- a/sys/nfsclient/nfs_node.c +++ b/sys/nfsclient/nfs_node.c @@ -158,8 +158,8 @@ nfs_nget(struct mount *mntp, nfsfh_t *fhp, int fhsize, struct nfsnode **npp, int /* * NFS supports recursive and shared locking. */ - vp->v_vnlock->lk_flags |= LK_CANRECURSE; - vp->v_vnlock->lk_flags &= ~LK_NOSHARE; + VN_LOCK_AREC(vp); + VN_LOCK_ASHARE(vp); if (fhsize > NFS_SMALLFH) { MALLOC(np->n_fhp, nfsfh_t *, fhsize, M_NFSBIGFH, M_WAITOK); } else |
