diff options
| author | Jeff Roberson <jeff@FreeBSD.org> | 2003-08-28 00:52:23 +0000 |
|---|---|---|
| committer | Jeff Roberson <jeff@FreeBSD.org> | 2003-08-28 00:52:23 +0000 |
| commit | 7abc12de034f02ea3803714bfa890a24e434bcf3 (patch) | |
| tree | cab2c27d94406d08a8ec7b75be6542ca9b3d238c /sys/gnu | |
| parent | 289dc689c62b8171b10bf5fc0638e3ac2a4a7b0a (diff) | |
Notes
Diffstat (limited to 'sys/gnu')
| -rw-r--r-- | sys/gnu/ext2fs/fs.h | 12 | ||||
| -rw-r--r-- | sys/gnu/fs/ext2fs/fs.h | 12 |
2 files changed, 4 insertions, 20 deletions
diff --git a/sys/gnu/ext2fs/fs.h b/sys/gnu/ext2fs/fs.h index 9c0cf71a56da..c54f979eea2d 100644 --- a/sys/gnu/ext2fs/fs.h +++ b/sys/gnu/ext2fs/fs.h @@ -156,22 +156,14 @@ extern u_char *fragtbl[]; * To lock a buffer, set the B_LOCKED flag and then brelse() it. To unlock, * reset the B_LOCKED flag and brelse() the buffer back on the LRU list */ -#define LCK_BUF(bp) { \ - int s; \ - s = splbio(); \ - (bp)->b_flags |= B_LOCKED; \ - splx(s); \ - brelse(bp); \ -} +#define LCK_BUF(bp) BUF_KERNPROC(bp); #define ULCK_BUF(bp) { \ long flags; \ int s; \ s = splbio(); \ - BUF_LOCK(bp, LK_EXCLUSIVE, NULL); \ flags = (bp)->b_flags; \ - (bp)->b_flags &= ~(B_DIRTY | B_LOCKED); \ - bremfree(bp); \ + (bp)->b_flags &= ~(B_DIRTY); \ splx(s); \ if (flags & B_DIRTY) \ bwrite(bp); \ diff --git a/sys/gnu/fs/ext2fs/fs.h b/sys/gnu/fs/ext2fs/fs.h index 9c0cf71a56da..c54f979eea2d 100644 --- a/sys/gnu/fs/ext2fs/fs.h +++ b/sys/gnu/fs/ext2fs/fs.h @@ -156,22 +156,14 @@ extern u_char *fragtbl[]; * To lock a buffer, set the B_LOCKED flag and then brelse() it. To unlock, * reset the B_LOCKED flag and brelse() the buffer back on the LRU list */ -#define LCK_BUF(bp) { \ - int s; \ - s = splbio(); \ - (bp)->b_flags |= B_LOCKED; \ - splx(s); \ - brelse(bp); \ -} +#define LCK_BUF(bp) BUF_KERNPROC(bp); #define ULCK_BUF(bp) { \ long flags; \ int s; \ s = splbio(); \ - BUF_LOCK(bp, LK_EXCLUSIVE, NULL); \ flags = (bp)->b_flags; \ - (bp)->b_flags &= ~(B_DIRTY | B_LOCKED); \ - bremfree(bp); \ + (bp)->b_flags &= ~(B_DIRTY); \ splx(s); \ if (flags & B_DIRTY) \ bwrite(bp); \ |