diff options
| author | jeff <jeff@FreeBSD.org> | 2013-05-31 00:43:41 +0000 |
|---|---|---|
| committer | jeff <jeff@FreeBSD.org> | 2013-05-31 00:43:41 +0000 |
| commit | d7efebc4db8c1b875c915fb1a2759cb9df4f2956 (patch) | |
| tree | 47c74a9a8f1d3fbea9e54f402b3cf363e92546a4 /sys/ufs/ffs/ffs_vfsops.c | |
| parent | 7c988b2ec361d43cc84f05e89080a923a7101a76 (diff) | |
| download | FreeBSD-src-d7efebc4db8c1b875c915fb1a2759cb9df4f2956.zip FreeBSD-src-d7efebc4db8c1b875c915fb1a2759cb9df4f2956.tar.gz | |
- 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
Diffstat (limited to 'sys/ufs/ffs/ffs_vfsops.c')
| -rw-r--r-- | sys/ufs/ffs/ffs_vfsops.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c index d4c035f..57f092c 100644 --- a/sys/ufs/ffs/ffs_vfsops.c +++ b/sys/ufs/ffs/ffs_vfsops.c @@ -52,6 +52,7 @@ __FBSDID("$FreeBSD$"); #include <sys/ioccom.h> #include <sys/malloc.h> #include <sys/mutex.h> +#include <sys/rwlock.h> #include <security/mac/mac_framework.h> @@ -2076,7 +2077,8 @@ ffs_bufwrite(struct buf *bp) return (0); } bp->b_vflags |= BV_BKGRDWAIT; - msleep(&bp->b_xflags, BO_MTX(bp->b_bufobj), PRIBIO, "bwrbg", 0); + msleep(&bp->b_xflags, BO_LOCKPTR(bp->b_bufobj), PRIBIO, + "bwrbg", 0); if (bp->b_vflags & BV_BKGRDINPROG) panic("bufwrite: still writing"); } |
