diff options
Diffstat (limited to 'fs/ocfs2/journal.c')
-rw-r--r-- | fs/ocfs2/journal.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/fs/ocfs2/journal.c b/fs/ocfs2/journal.c index ae3440ca083c..6a610ae53583 100644 --- a/fs/ocfs2/journal.c +++ b/fs/ocfs2/journal.c | |||
@@ -377,7 +377,7 @@ int ocfs2_journal_access(struct ocfs2_journal_handle *handle, | |||
377 | BUG_ON(!bh); | 377 | BUG_ON(!bh); |
378 | BUG_ON(!(handle->flags & OCFS2_HANDLE_STARTED)); | 378 | BUG_ON(!(handle->flags & OCFS2_HANDLE_STARTED)); |
379 | 379 | ||
380 | mlog_entry("bh->b_blocknr=%llu, type=%d (\"%s\"), bh->b_size = %hu\n", | 380 | mlog_entry("bh->b_blocknr=%llu, type=%d (\"%s\"), bh->b_size = %zu\n", |
381 | (unsigned long long)bh->b_blocknr, type, | 381 | (unsigned long long)bh->b_blocknr, type, |
382 | (type == OCFS2_JOURNAL_ACCESS_CREATE) ? | 382 | (type == OCFS2_JOURNAL_ACCESS_CREATE) ? |
383 | "OCFS2_JOURNAL_ACCESS_CREATE" : | 383 | "OCFS2_JOURNAL_ACCESS_CREATE" : |
@@ -582,7 +582,8 @@ int ocfs2_journal_init(struct ocfs2_journal *journal, int *dirty) | |||
582 | } | 582 | } |
583 | 583 | ||
584 | mlog(0, "inode->i_size = %lld\n", inode->i_size); | 584 | mlog(0, "inode->i_size = %lld\n", inode->i_size); |
585 | mlog(0, "inode->i_blocks = %lu\n", inode->i_blocks); | 585 | mlog(0, "inode->i_blocks = %llu\n", |
586 | (unsigned long long)inode->i_blocks); | ||
586 | mlog(0, "inode->ip_clusters = %u\n", OCFS2_I(inode)->ip_clusters); | 587 | mlog(0, "inode->ip_clusters = %u\n", OCFS2_I(inode)->ip_clusters); |
587 | 588 | ||
588 | /* call the kernels journal init function now */ | 589 | /* call the kernels journal init function now */ |
@@ -850,8 +851,9 @@ static int ocfs2_force_read_journal(struct inode *inode) | |||
850 | 851 | ||
851 | memset(bhs, 0, sizeof(struct buffer_head *) * CONCURRENT_JOURNAL_FILL); | 852 | memset(bhs, 0, sizeof(struct buffer_head *) * CONCURRENT_JOURNAL_FILL); |
852 | 853 | ||
853 | mlog(0, "Force reading %lu blocks\n", | 854 | mlog(0, "Force reading %llu blocks\n", |
854 | (inode->i_blocks >> (inode->i_sb->s_blocksize_bits - 9))); | 855 | (unsigned long long)(inode->i_blocks >> |
856 | (inode->i_sb->s_blocksize_bits - 9))); | ||
855 | 857 | ||
856 | v_blkno = 0; | 858 | v_blkno = 0; |
857 | while (v_blkno < | 859 | while (v_blkno < |