[PATCH 000 of 2] md: To more bugfixes for 2.6.25

[PATCH 000 of 2] md: To more bugfixes for 2.6.25

[NeilBrown]

Two more little bug fixes for md in 2.6.25.

One fixes a formatting error in /proc/mdstat.  Technically this is a
user-interface change for an interface that has been around since
2.6.15.  However the only program known to parse this file trips over
the error.  So I think it is safe to fix it.

The second fixes a small bug in a recent patch.

 [PATCH 001 of 2] md: Fix formatting error in /proc/mdstat.
 [PATCH 002 of 2] md: Reduce CPU wastage on idle md array with a write-intent bitmap. fix

[PATCH 001 of 2] md: Fix formatting error in /proc/mdstat.

[NeilBrown]

If an md array is "auto-read-only", then this appears in /proc/mdstat
as

   /dev/md0: active(auto-read-only)

whereas if it is truely readonly, it appears as

   /dev/md0: active (read-only)

The difference being a space. 

One program known to parse this file expects the space and gets badly
confused.  It will be fixed, but it would be best if what the kernel
generates is more consistent too.

Signed-off-by: Neil Brown <neilb@suse.de>

### Diffstat output
 ./drivers/md/md.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff .prev/drivers/md/md.c ./drivers/md/md.c
--- .prev/drivers/md/md.c	2008-03-07 15:51:24.000000000 +1100
+++ ./drivers/md/md.c	2008-03-07 15:52:21.000000000 +1100
@@ -5149,7 +5149,7 @@ static int md_seq_show(struct seq_file *
 			if (mddev->ro==1)
 				seq_printf(seq, " (read-only)");
 			if (mddev->ro==2)
-				seq_printf(seq, "(auto-read-only)");
+				seq_printf(seq, " (auto-read-only)");
 			seq_printf(seq, " %s", mddev->pers->name);
 		}
 

[PATCH 002 of 2] md: Reduce CPU wastage on idle md array with a write-intent bitmap. fix

[NeilBrown]

Recent patch titled
  Reduce CPU wastage on idle md array with a write-intent bitmap.

would sometimes leave the array with dirty bitmap bits that stay
dirty.  A subsequent write would sort things out so it isn't a big
problem, but should be fixed nonetheless.

We need to make sure that when the bitmap becomes not "allclean", the
daemon_sleep really does get set to a sensible value.


Signed-off-by: Neil Brown <neilb@suse.de>

### Diffstat output
 ./drivers/md/bitmap.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff .prev/drivers/md/bitmap.c ./drivers/md/bitmap.c
--- .prev/drivers/md/bitmap.c	2008-03-07 15:51:23.000000000 +1100
+++ ./drivers/md/bitmap.c	2008-03-07 15:56:57.000000000 +1100
@@ -1045,7 +1045,8 @@ void bitmap_daemon_work(struct bitmap *b
 	if (bitmap == NULL)
 		return;
 	if (time_before(jiffies, bitmap->daemon_lastrun + bitmap->daemon_sleep*HZ))
-		return;
+		goto done;
+
 	bitmap->daemon_lastrun = jiffies;
 	if (bitmap->allclean) {
 		bitmap->mddev->thread->timeout = MAX_SCHEDULE_TIMEOUT;
@@ -1142,6 +1143,7 @@ void bitmap_daemon_work(struct bitmap *b
 		}
 	}
 
+ done:
 	if (bitmap->allclean == 0)
 		bitmap->mddev->thread->timeout = bitmap->daemon_sleep * HZ;
 }