diff options
author | Zheng Liu <wenqing.lz@taobao.com> | 2011-12-05 02:55:11 -0500 |
---|---|---|
committer | Jan Kara <jack@suse.cz> | 2012-01-09 07:52:07 -0500 |
commit | d03e1292c46721f60830c5d2e334966472002ed0 (patch) | |
tree | bc5a9f63fc52e4b96a6e9faa9457cb47d70b2cc7 /fs/ext3/super.c | |
parent | bcdd0c1600903e9222abfcde28947406020ccb5d (diff) |
ext3: replace ll_rw_block with other functions
ll_rw_block() is deprecated. Thus we replace it with other functions.
CC: Jan Kara <jack@suse.cz>
Signed-off-by: Zheng Liu <wenqing.lz@taobao.com>
Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/ext3/super.c')
-rw-r--r-- | fs/ext3/super.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/ext3/super.c b/fs/ext3/super.c index 767fa3a2bd17..662cef4569ab 100644 --- a/fs/ext3/super.c +++ b/fs/ext3/super.c | |||
@@ -2231,11 +2231,11 @@ static journal_t *ext3_get_dev_journal(struct super_block *sb, | |||
2231 | goto out_bdev; | 2231 | goto out_bdev; |
2232 | } | 2232 | } |
2233 | journal->j_private = sb; | 2233 | journal->j_private = sb; |
2234 | ll_rw_block(READ, 1, &journal->j_sb_buffer); | 2234 | if (!bh_uptodate_or_lock(journal->j_sb_buffer)) { |
2235 | wait_on_buffer(journal->j_sb_buffer); | 2235 | if (bh_submit_read(journal->j_sb_buffer)) { |
2236 | if (!buffer_uptodate(journal->j_sb_buffer)) { | 2236 | ext3_msg(sb, KERN_ERR, "I/O error on journal device"); |
2237 | ext3_msg(sb, KERN_ERR, "I/O error on journal device"); | 2237 | goto out_journal; |
2238 | goto out_journal; | 2238 | } |
2239 | } | 2239 | } |
2240 | if (be32_to_cpu(journal->j_superblock->s_nr_users) != 1) { | 2240 | if (be32_to_cpu(journal->j_superblock->s_nr_users) != 1) { |
2241 | ext3_msg(sb, KERN_ERR, | 2241 | ext3_msg(sb, KERN_ERR, |