Quick fix for not being able to sync all the buffers in boot() if

an ext2fs file system is mounted.  The soft update changes added
a check for B_DELWRI buffers.  This exposed the complete brokenness
of the previous quick fix for failing syncs (PR 3571, committed on
1997/08/04).  Use a new buffer flag B_DIRTY and don't abuse B_DELWRI.
B_DIRTY buffers are still written too late, as broken in the previous
fix.  This is fairly harmless, because B_DIRTY is only used for
bitmap buffers and fsck.ext2 can fix up the bitmaps perfectly.

Fixed a race in ULCK_BUF() (bremfree() was outside of the splbio()
section).

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 00e1a5a..4cfb6a7 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 3cb4fc0..17b5beb 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 00e1a5a..4cfb6a7 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 3cb4fc0..17b5beb 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); \
 }