diff options
| author | Bruce Evans <bde@FreeBSD.org> | 1998-10-03 16:19:28 +0000 |
|---|---|---|
| committer | Bruce Evans <bde@FreeBSD.org> | 1998-10-03 16:19:28 +0000 |
| commit | 8f359bc68c24ccfff3754c753a4a65d529f60b30 (patch) | |
| tree | cbd95a92e112ac21eea9f323dde45aade67dc92f /sys/gnu | |
| parent | aef1f383cff8d317d4b8161ffc59681083e6690c (diff) | |
Notes
Diffstat (limited to 'sys/gnu')
| -rw-r--r-- | sys/gnu/ext2fs/ext2_linux_ialloc.c | 6 | ||||
| -rw-r--r-- | sys/gnu/ext2fs/fs.h | 12 | ||||
| -rw-r--r-- | sys/gnu/fs/ext2fs/ext2_linux_ialloc.c | 6 | ||||
| -rw-r--r-- | sys/gnu/fs/ext2fs/fs.h | 12 |
4 files changed, 20 insertions, 16 deletions
diff --git a/sys/gnu/ext2fs/ext2_linux_ialloc.c b/sys/gnu/ext2fs/ext2_linux_ialloc.c index 00e1a5a5e0d2..4cfb6a721dfa 100644 --- a/sys/gnu/ext2fs/ext2_linux_ialloc.c +++ b/sys/gnu/ext2fs/ext2_linux_ialloc.c @@ -56,11 +56,7 @@ void mark_buffer_dirty(struct buf *bh) int s; s = splbio(); - if (!(bh->b_flags & B_DELWRI)) { - numdirtybuffers++; - bh->b_flags |= B_DELWRI; - bh->b_flags &= ~(B_READ | B_ERROR); - } + bh->b_flags |= B_DIRTY; splx(s); } diff --git a/sys/gnu/ext2fs/fs.h b/sys/gnu/ext2fs/fs.h index 3cb4fc0095d1..17b5beb7fa16 100644 --- a/sys/gnu/ext2fs/fs.h +++ b/sys/gnu/ext2fs/fs.h @@ -168,10 +168,16 @@ extern u_char *fragtbl[]; } #define ULCK_BUF(bp) { \ + long flags; \ int s; \ s = splbio(); \ - (bp)->b_flags &= ~B_LOCKED; \ - splx(s); \ + flags = (bp)->b_flags; \ + (bp)->b_flags &= ~(B_DIRTY | B_LOCKED); \ bremfree(bp); \ - brelse(bp); \ + (bp)->b_flags |= B_BUSY; \ + splx(s); \ + if (flags & B_DIRTY) \ + bdwrite(bp); \ + else \ + brelse(bp); \ } diff --git a/sys/gnu/fs/ext2fs/ext2_linux_ialloc.c b/sys/gnu/fs/ext2fs/ext2_linux_ialloc.c index 00e1a5a5e0d2..4cfb6a721dfa 100644 --- a/sys/gnu/fs/ext2fs/ext2_linux_ialloc.c +++ b/sys/gnu/fs/ext2fs/ext2_linux_ialloc.c @@ -56,11 +56,7 @@ void mark_buffer_dirty(struct buf *bh) int s; s = splbio(); - if (!(bh->b_flags & B_DELWRI)) { - numdirtybuffers++; - bh->b_flags |= B_DELWRI; - bh->b_flags &= ~(B_READ | B_ERROR); - } + bh->b_flags |= B_DIRTY; splx(s); } diff --git a/sys/gnu/fs/ext2fs/fs.h b/sys/gnu/fs/ext2fs/fs.h index 3cb4fc0095d1..17b5beb7fa16 100644 --- a/sys/gnu/fs/ext2fs/fs.h +++ b/sys/gnu/fs/ext2fs/fs.h @@ -168,10 +168,16 @@ extern u_char *fragtbl[]; } #define ULCK_BUF(bp) { \ + long flags; \ int s; \ s = splbio(); \ - (bp)->b_flags &= ~B_LOCKED; \ - splx(s); \ + flags = (bp)->b_flags; \ + (bp)->b_flags &= ~(B_DIRTY | B_LOCKED); \ bremfree(bp); \ - brelse(bp); \ + (bp)->b_flags |= B_BUSY; \ + splx(s); \ + if (flags & B_DIRTY) \ + bdwrite(bp); \ + else \ + brelse(bp); \ } |