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/nfsclient | |
| parent | c4becf737034b77bc0c44fa420dde00cf3c01b40 (diff) | |
| download | src-test2-22a722605d723aab89d510c7a77d6508fb995785.tar.gz src-test2-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/nfsclient')
| -rw-r--r-- | sys/nfsclient/nfs_subs.c | 1 | ||||
| -rw-r--r-- | sys/nfsclient/nfs_vnops.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/sys/nfsclient/nfs_subs.c b/sys/nfsclient/nfs_subs.c index 2ab02f088c07..c41bc613f38b 100644 --- a/sys/nfsclient/nfs_subs.c +++ b/sys/nfsclient/nfs_subs.c @@ -56,6 +56,7 @@ __FBSDID("$FreeBSD$"); #include <sys/socket.h> #include <sys/stat.h> #include <sys/malloc.h> +#include <sys/rwlock.h> #include <sys/sysent.h> #include <sys/syscall.h> #include <sys/sysproto.h> diff --git a/sys/nfsclient/nfs_vnops.c b/sys/nfsclient/nfs_vnops.c index c5d2e180e86e..d834b89de898 100644 --- a/sys/nfsclient/nfs_vnops.c +++ b/sys/nfsclient/nfs_vnops.c @@ -3177,7 +3177,7 @@ loop: error = BUF_TIMELOCK(bp, LK_EXCLUSIVE | LK_SLEEPFAIL | LK_INTERLOCK, - BO_MTX(bo), "nfsfsync", slpflag, slptimeo); + BO_LOCKPTR(bo), "nfsfsync", slpflag, slptimeo); if (error == 0) { BUF_UNLOCK(bp); goto loop; |