Commit 3add3928 authored by Dave Jones's avatar Dave Jones

[PATCH] Fix reiserfs oops with seperate journal dev

From Oleg@namesys.
parent 4a85ebdb
...@@ -1958,8 +1958,7 @@ static int journal_init_dev( struct super_block *super, ...@@ -1958,8 +1958,7 @@ static int journal_init_dev( struct super_block *super,
SB_ONDISK_JOURNAL_DEVICE( super ) ? SB_ONDISK_JOURNAL_DEVICE( super ) ?
to_kdev_t(SB_ONDISK_JOURNAL_DEVICE( super )) : super -> s_dev; to_kdev_t(SB_ONDISK_JOURNAL_DEVICE( super )) : super -> s_dev;
/* there is no "jdev" option and journal is on separate device */ /* there is no "jdev" option and journal is on separate device */
if( ( !jdev_name || !jdev_name[ 0 ] ) && if( ( !jdev_name || !jdev_name[ 0 ] ) ) {
SB_ONDISK_JOURNAL_DEVICE( super ) ) {
journal -> j_dev_bd = bdget( kdev_t_to_nr( jdev ) ); journal -> j_dev_bd = bdget( kdev_t_to_nr( jdev ) );
if( journal -> j_dev_bd ) if( journal -> j_dev_bd )
result = blkdev_get( journal -> j_dev_bd, result = blkdev_get( journal -> j_dev_bd,
...@@ -1974,9 +1973,6 @@ static int journal_init_dev( struct super_block *super, ...@@ -1974,9 +1973,6 @@ static int journal_init_dev( struct super_block *super,
return result; 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 ); journal -> j_dev_file = filp_open( jdev_name, 0, 0 );
if( !IS_ERR( journal -> j_dev_file ) ) { if( !IS_ERR( journal -> j_dev_file ) ) {
struct inode *jdev_inode; struct inode *jdev_inode;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment