diff options
| author | Jeff Roberson <jeff@FreeBSD.org> | 2013-05-31 00:43:41 +0000 |
|---|---|---|
| committer | Jeff Roberson <jeff@FreeBSD.org> | 2013-05-31 00:43:41 +0000 |
| commit | 22a722605d723aab89d510c7a77d6508fb995785 (patch) | |
| tree | 47c74a9a8f1d3fbea9e54f402b3cf363e92546a4 /sys/nfsserver | |
| parent | c4becf737034b77bc0c44fa420dde00cf3c01b40 (diff) | |
| download | src-22a722605d723aab89d510c7a77d6508fb995785.tar.gz src-22a722605d723aab89d510c7a77d6508fb995785.zip | |
- Convert the bufobj lock to rwlock.
- Use a shared bufobj lock in getblk() and inmem().
- Convert softdep's lk to rwlock to match the bufobj lock.
- Move INFREECNT to b_flags and protect it with the buf lock.
- Remove unnecessary locking around bremfree() and BKGRDINPROG.
Sponsored by: EMC / Isilon Storage Division
Discussed with: mckusick, kib, mdf
Notes
Notes:
svn path=/head/; revision=251171
Diffstat (limited to 'sys/nfsserver')
| -rw-r--r-- | sys/nfsserver/nfs_serv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/nfsserver/nfs_serv.c b/sys/nfsserver/nfs_serv.c index 2e7d8b0caff7..c1a7d2ae9506 100644 --- a/sys/nfsserver/nfs_serv.c +++ b/sys/nfsserver/nfs_serv.c @@ -3387,7 +3387,7 @@ nfsrv_commit(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp, */ if ((bp = gbincore(&vp->v_bufobj, lblkno)) != NULL) { if (BUF_LOCK(bp, LK_EXCLUSIVE | LK_SLEEPFAIL | - LK_INTERLOCK, BO_MTX(bo)) == ENOLCK) { + LK_INTERLOCK, BO_LOCKPTR(bo)) == ENOLCK) { BO_LOCK(bo); continue; /* retry */ } |