diff options
Diffstat (limited to 'fs/ocfs2/journal.c')
-rw-r--r-- | fs/ocfs2/journal.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/ocfs2/journal.c b/fs/ocfs2/journal.c index a126cb37ca4d..44fc3e530c3d 100644 --- a/fs/ocfs2/journal.c +++ b/fs/ocfs2/journal.c | |||
@@ -836,14 +836,14 @@ int ocfs2_journal_init(struct ocfs2_journal *journal, int *dirty) | |||
836 | inode_lock = 1; | 836 | inode_lock = 1; |
837 | di = (struct ocfs2_dinode *)bh->b_data; | 837 | di = (struct ocfs2_dinode *)bh->b_data; |
838 | 838 | ||
839 | if (inode->i_size < OCFS2_MIN_JOURNAL_SIZE) { | 839 | if (i_size_read(inode) < OCFS2_MIN_JOURNAL_SIZE) { |
840 | mlog(ML_ERROR, "Journal file size (%lld) is too small!\n", | 840 | mlog(ML_ERROR, "Journal file size (%lld) is too small!\n", |
841 | inode->i_size); | 841 | i_size_read(inode)); |
842 | status = -EINVAL; | 842 | status = -EINVAL; |
843 | goto done; | 843 | goto done; |
844 | } | 844 | } |
845 | 845 | ||
846 | trace_ocfs2_journal_init(inode->i_size, | 846 | trace_ocfs2_journal_init(i_size_read(inode), |
847 | (unsigned long long)inode->i_blocks, | 847 | (unsigned long long)inode->i_blocks, |
848 | OCFS2_I(inode)->ip_clusters); | 848 | OCFS2_I(inode)->ip_clusters); |
849 | 849 | ||
@@ -1131,7 +1131,7 @@ static int ocfs2_force_read_journal(struct inode *inode) | |||
1131 | 1131 | ||
1132 | memset(bhs, 0, sizeof(struct buffer_head *) * CONCURRENT_JOURNAL_FILL); | 1132 | memset(bhs, 0, sizeof(struct buffer_head *) * CONCURRENT_JOURNAL_FILL); |
1133 | 1133 | ||
1134 | num_blocks = ocfs2_blocks_for_bytes(inode->i_sb, inode->i_size); | 1134 | num_blocks = ocfs2_blocks_for_bytes(inode->i_sb, i_size_read(inode)); |
1135 | v_blkno = 0; | 1135 | v_blkno = 0; |
1136 | while (v_blkno < num_blocks) { | 1136 | while (v_blkno < num_blocks) { |
1137 | status = ocfs2_extent_map_get_blocks(inode, v_blkno, | 1137 | status = ocfs2_extent_map_get_blocks(inode, v_blkno, |