Skip to content

Commit

Permalink
jbd2: fix /proc/fs/jbd2/<dev> when using an external journal
Browse files Browse the repository at this point in the history
In jbd2_journal_init_dev(), we need make sure the journal structure is
fully initialzied before calling jbd2_stats_proc_init().

Reviewed-by: Andreas Dilger <andreas.dilger@oracle.com>
Signed-off-by: yangsheng <sheng.yang@oracle.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
  • Loading branch information
yangsheng authored and Theodore Ts'o committed Nov 18, 2010
1 parent f4c8cc6 commit 0587aa3
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions fs/jbd2/journal.c
Original file line number Diff line number Diff line change
Expand Up @@ -899,6 +899,14 @@ journal_t * jbd2_journal_init_dev(struct block_device *bdev,

/* journal descriptor can store up to n blocks -bzzz */
journal->j_blocksize = blocksize;
journal->j_dev = bdev;
journal->j_fs_dev = fs_dev;
journal->j_blk_offset = start;
journal->j_maxlen = len;
bdevname(journal->j_dev, journal->j_devname);
p = journal->j_devname;
while ((p = strchr(p, '/')))
*p = '!';
jbd2_stats_proc_init(journal);
n = journal->j_blocksize / sizeof(journal_block_tag_t);
journal->j_wbufsize = n;
Expand All @@ -908,14 +916,6 @@ journal_t * jbd2_journal_init_dev(struct block_device *bdev,
__func__);
goto out_err;
}
journal->j_dev = bdev;
journal->j_fs_dev = fs_dev;
journal->j_blk_offset = start;
journal->j_maxlen = len;
bdevname(journal->j_dev, journal->j_devname);
p = journal->j_devname;
while ((p = strchr(p, '/')))
*p = '!';

bh = __getblk(journal->j_dev, start, journal->j_blocksize);
if (!bh) {
Expand Down

0 comments on commit 0587aa3

Please sign in to comment.