diff options
Diffstat (limited to 'fs/ocfs2')
-rw-r--r-- | fs/ocfs2/journal.c | 8 | ||||
-rw-r--r-- | fs/ocfs2/namei.c | 5 |
2 files changed, 8 insertions, 5 deletions
diff --git a/fs/ocfs2/journal.c b/fs/ocfs2/journal.c index ae3440ca083c..90641929a437 100644 --- a/fs/ocfs2/journal.c +++ b/fs/ocfs2/journal.c | |||
@@ -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 < |
diff --git a/fs/ocfs2/namei.c b/fs/ocfs2/namei.c index 274f61d0cda9..0673862c8bdd 100644 --- a/fs/ocfs2/namei.c +++ b/fs/ocfs2/namei.c | |||
@@ -1444,8 +1444,9 @@ static int ocfs2_create_symlink_data(struct ocfs2_super *osb, | |||
1444 | * write i_size + 1 bytes. */ | 1444 | * write i_size + 1 bytes. */ |
1445 | blocks = (bytes_left + sb->s_blocksize - 1) >> sb->s_blocksize_bits; | 1445 | blocks = (bytes_left + sb->s_blocksize - 1) >> sb->s_blocksize_bits; |
1446 | 1446 | ||
1447 | mlog_entry("i_blocks = %lu, i_size = %llu, blocks = %d\n", | 1447 | mlog_entry("i_blocks = %llu, i_size = %llu, blocks = %d\n", |
1448 | inode->i_blocks, i_size_read(inode), blocks); | 1448 | (unsigned long long)inode->i_blocks, |
1449 | i_size_read(inode), blocks); | ||
1449 | 1450 | ||
1450 | /* Sanity check -- make sure we're going to fit. */ | 1451 | /* Sanity check -- make sure we're going to fit. */ |
1451 | if (bytes_left > | 1452 | if (bytes_left > |