aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryangsheng <sheng.yang@oracle.com>2010-11-17 21:46:26 -0500
committerTheodore Ts'o <tytso@mit.edu>2010-11-17 21:46:26 -0500
commit0587aa3d11f9769a301b21bff2c3ed8365606b8d (patch)
treec02512f57fc11b37da4764c10a5e2ef42cc5ecbe
parentf4c8cc652d9f70680dd91be60a7a455040d0a282 (diff)
downloadmrst-s0i3-test-0587aa3d11f9769a301b21bff2c3ed8365606b8d.tar.gz
mrst-s0i3-test-0587aa3d11f9769a301b21bff2c3ed8365606b8d.tar.xz
mrst-s0i3-test-0587aa3d11f9769a301b21bff2c3ed8365606b8d.zip
jbd2: fix /proc/fs/jbd2/<dev> when using an external journal
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>
-rw-r--r--fs/jbd2/journal.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
index c590d155c09..f837ba95352 100644
--- a/fs/jbd2/journal.c
+++ b/fs/jbd2/journal.c
@@ -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;
@@ -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) {