Re: Data-logging and md as / fs bug

[Chris Mason <mason@suse.com>]

On Wed, 2003-05-07 at 11:23, Chris Mason wrote:

[ md complains about busy devices on reboot ]

> Ok, it's probably because of the way the journal relocation code grabs
> the journal device.  Since root doesn't really get fully unmounted we've
> probably got a reference open and that is upsetting the md code.
> 
> The right fix is probably to skip the bdget when the journal device is
> not external , and just set journal->j_dev_bd to super->s_bdev.

Hopefully 03-relocation-8.diff fixes this.  The incremental is below if
you'd like to give it a try, but use with caution as I haven't tested on
an md root device here.

diff -Nru a/fs/reiserfs/journal.c b/fs/reiserfs/journal.c
--- a/fs/reiserfs/journal.c	Thu May  8 09:38:49 2003
+++ b/fs/reiserfs/journal.c	Thu May  8 09:38:49 2003
@@ -2294,7 +2294,7 @@
     
     result = 0;
 	
-    if( journal -> j_dev_bd != NULL ) {
+    if( journal -> j_dev_bd != NULL && journal->j_dev_bd != super->s_bdev) {
 	result = blkdev_put( journal -> j_dev_bd, BDEV_FS );
 	journal -> j_dev_bd = NULL;
     }
@@ -2330,6 +2330,14 @@
 
 	if( ( !jdev_name || !jdev_name[ 0 ] ) ) {
 
+		/* don't add an extra reference to the device when 
+		 * the log is on the same disk as the FS.  It makes the
+		 * raid code unhappy
+		 */
+		if (jdev == super->s_dev) {
+		    journal->j_dev_bd = super->s_bdev;
+		    return 0;
+		}
 		journal -> j_dev_bd = bdget( kdev_t_to_nr( jdev ) );
 		if( journal -> j_dev_bd ) {
 			result = blkdev_get( journal -> j_dev_bd,