From f343a97f98b8993127810bd701dda545af3ba0f9 Mon Sep 17 00:00:00 2001 From: Edward Shishkin Date: Sun, 1 May 2005 08:59:09 -0700 Subject: [PATCH] --- yaml --- r: 733 b: refs/heads/master c: 74f9f974a64dc3de554aa1977bf108334436e47b h: refs/heads/master i: 731: 2895e20eef8d5ef529227ff0cda391c2cd52340e v: v3 --- [refs] | 2 +- trunk/fs/reiserfs/journal.c | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index f8f9915bd21c..febc34493115 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 439bd3708792e31057db424d1165473122d531a3 +refs/heads/master: 74f9f974a64dc3de554aa1977bf108334436e47b diff --git a/trunk/fs/reiserfs/journal.c b/trunk/fs/reiserfs/journal.c index c9ad3a7849f4..b16d65acb550 100644 --- a/trunk/fs/reiserfs/journal.c +++ b/trunk/fs/reiserfs/journal.c @@ -2306,13 +2306,16 @@ static int journal_init_dev( struct super_block *super, if( !IS_ERR( journal -> j_dev_file ) ) { struct inode *jdev_inode = journal->j_dev_file->f_mapping->host; if( !S_ISBLK( jdev_inode -> i_mode ) ) { - reiserfs_warning (super, "journal_init_dev: '%s' is " - "not a block device", jdev_name ); + reiserfs_warning(super, "journal_init_dev: '%s' is " + "not a block device", jdev_name ); result = -ENOTBLK; + release_journal_dev( super, journal ); } else { /* ok */ journal->j_dev_bd = I_BDEV(jdev_inode); set_blocksize(journal->j_dev_bd, super->s_blocksize); + reiserfs_info(super, "journal_init_dev: journal device: %s\n", + bdevname(journal->j_dev_bd, b)); } } else { result = PTR_ERR( journal -> j_dev_file ); @@ -2321,11 +2324,6 @@ static int journal_init_dev( struct super_block *super, "journal_init_dev: Cannot open '%s': %i", jdev_name, result ); } - if( result != 0 ) { - release_journal_dev( super, journal ); - } - reiserfs_info(super, "journal_init_dev: journal device: %s\n", - bdevname(journal->j_dev_bd, b)); return result; }