[2.5.7-pre1] Reiserfs mounting oops patch

[Sebastian Droege]

--=.:yG7pxqY9b7Jo9
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit

Hi,
here is a patch somebody has posted some time ago (Oleg Drokin I think), but it isn't included in 2.5.7-pre1 and some people might miss it first (like me ;) )
I think the patch is really important, because you can't mount a reiserfs partition without it
It fixes an oops when mounting a reiserfs partition and it works for me

Bye

--- fs/reiserfs/journal.c.old   Wed Mar 13 15:40:14 2002
+++ fs/reiserfs/journal.c       Wed Mar 13 15:41:23 2002
@@ -1958,8 +1958,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, 
@@ -1974,9 +1973,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;
--=.:yG7pxqY9b7Jo9
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.6 (GNU/Linux)

iD8DBQE8j2dXe9FFpVVDScsRAuQ2AKD0tAqUkbvP9f7pz70rKdGohDwhgwCg1DND
KaWltWPkUfGEBgenHoetbus=
=lUeV
-----END PGP SIGNATURE-----

--=.:yG7pxqY9b7Jo9--