Re: Opss! on 2.5.6 with ReiserFS

[Oleg Drokin <green@namesys.com>]

[-- Attachment #1: Type: text/plain, Size: 353 bytes --]

Hello!

On Sun, Mar 10, 2002 at 02:26:09PM -0500, rwhron@earthlink.net wrote:
> I have got oops at boot time from 2.5.6-pre3 and 2.5.6 on 
> system with reiserfs root filesystem on ide.  Oops occurs
> during attempt to mount /.   No modules in kernel.  
> 2.5.6-pre2 was okay.

This is a known merge problem, attached patch will cure it.

Bye,
    Oleg

[-- Attachment #2: 00-jdev_bd_merging_fix.diff --]
[-- Type: text/plain, Size: 891 bytes --]

--- linux-2.5.6-pre3/fs/reiserfs/journal.c.orig	Thu Mar  7 12:44:43 2002
+++ linux-2.5.6-pre3/fs/reiserfs/journal.c	Thu Mar  7 13:53:36 2002
@@ -1960,8 +1960,7 @@
       		SB_ONDISK_JOURNAL_DEVICE( super ) ?
 		to_kdev_t(SB_ONDISK_JOURNAL_DEVICE( super )) : super -> s_dev;	
 	/* there is no "jdev" option and journal is on separate device */
-	if( ( !jdev_name || !jdev_name[ 0 ] ) && 
-	    SB_ONDISK_JOURNAL_DEVICE( super ) ) {
+	if( ( !jdev_name || !jdev_name[ 0 ] ) ) {
 		journal -> j_dev_bd = bdget( kdev_t_to_nr( jdev ) );
 		if( journal -> j_dev_bd )
 			result = blkdev_get( journal -> j_dev_bd, 
@@ -1976,9 +1975,6 @@
 		return result;
 	}
 
-	/* no "jdev" option and journal is on the host device */
-	if( !jdev_name || !jdev_name[ 0 ] )
-		return 0;
 	journal -> j_dev_file = filp_open( jdev_name, 0, 0 );
 	if( !IS_ERR( journal -> j_dev_file ) ) {
 		struct inode *jdev_inode;