From: Andrew Morton Cc: Takashi Sato Signed-off-by: Andrew Morton --- fs/cifs/inode.c | 6 +++--- fs/cifs/readdir.c | 8 ++++---- fs/ocfs2/journal.c | 8 +++++--- fs/ocfs2/namei.c | 5 +++-- cifs/file.c | 0 5 files changed, 15 insertions(+), 12 deletions(-) diff -puN fs/cifs/inode.c~2tb-files-add-blkcnt_t-fixes fs/cifs/inode.c --- devel/fs/cifs/inode.c~2tb-files-add-blkcnt_t-fixes 2006-03-11 02:47:07.000000000 -0800 +++ devel-akpm/fs/cifs/inode.c 2006-03-11 02:47:07.000000000 -0800 @@ -163,9 +163,9 @@ int cifs_get_inode_info_unix(struct inod if (num_of_bytes < end_of_file) cFYI(1, ("allocation size less than end of file")); - cFYI(1, - ("Size %ld and blocks %ld", - (unsigned long) inode->i_size, inode->i_blocks)); + cFYI(1, ("Size %ld and blocks %llu", + (unsigned long) inode->i_size, + (unsigned long long)inode->i_blocks)); if (S_ISREG(inode->i_mode)) { cFYI(1, ("File inode")); inode->i_op = &cifs_file_inode_ops; diff -puN fs/ocfs2/journal.c~2tb-files-add-blkcnt_t-fixes fs/ocfs2/journal.c --- devel/fs/ocfs2/journal.c~2tb-files-add-blkcnt_t-fixes 2006-03-11 02:47:07.000000000 -0800 +++ devel-akpm/fs/ocfs2/journal.c 2006-03-11 02:47:07.000000000 -0800 @@ -582,7 +582,8 @@ int ocfs2_journal_init(struct ocfs2_jour } mlog(0, "inode->i_size = %lld\n", inode->i_size); - mlog(0, "inode->i_blocks = %lu\n", inode->i_blocks); + mlog(0, "inode->i_blocks = %llu\n", + (unsigned long long)inode->i_blocks); mlog(0, "inode->ip_clusters = %u\n", OCFS2_I(inode)->ip_clusters); /* call the kernels journal init function now */ @@ -850,8 +851,9 @@ static int ocfs2_force_read_journal(stru memset(bhs, 0, sizeof(struct buffer_head *) * CONCURRENT_JOURNAL_FILL); - mlog(0, "Force reading %lu blocks\n", - (inode->i_blocks >> (inode->i_sb->s_blocksize_bits - 9))); + mlog(0, "Force reading %llu blocks\n", + (unsigned long long)(inode->i_blocks >> + (inode->i_sb->s_blocksize_bits - 9))); v_blkno = 0; while (v_blkno < diff -puN fs/ocfs2/namei.c~2tb-files-add-blkcnt_t-fixes fs/ocfs2/namei.c --- devel/fs/ocfs2/namei.c~2tb-files-add-blkcnt_t-fixes 2006-03-11 02:47:07.000000000 -0800 +++ devel-akpm/fs/ocfs2/namei.c 2006-03-11 02:47:07.000000000 -0800 @@ -1444,8 +1444,9 @@ static int ocfs2_create_symlink_data(str * write i_size + 1 bytes. */ blocks = (bytes_left + sb->s_blocksize - 1) >> sb->s_blocksize_bits; - mlog_entry("i_blocks = %lu, i_size = %llu, blocks = %d\n", - inode->i_blocks, i_size_read(inode), blocks); + mlog_entry("i_blocks = %llu, i_size = %llu, blocks = %d\n", + (unsigned long long)inode->i_blocks, + i_size_read(inode), blocks); /* Sanity check -- make sure we're going to fit. */ if (bytes_left > diff -puN fs/cifs/file.c~2tb-files-add-blkcnt_t-fixes fs/cifs/file.c diff -puN fs/cifs/readdir.c~2tb-files-add-blkcnt_t-fixes fs/cifs/readdir.c --- devel/fs/cifs/readdir.c~2tb-files-add-blkcnt_t-fixes 2006-03-11 02:47:07.000000000 -0800 +++ devel-akpm/fs/cifs/readdir.c 2006-03-11 02:47:07.000000000 -0800 @@ -197,10 +197,10 @@ static void fill_in_inode(struct inode * if (allocation_size < end_of_file) cFYI(1, ("May be sparse file, allocation less than file size")); - cFYI(1, - ("File Size %ld and blocks %ld and blocksize %ld", - (unsigned long)tmp_inode->i_size, tmp_inode->i_blocks, - tmp_inode->i_blksize)); + cFYI(1, ("File Size %ld and blocks %llu and blocksize %ld", + (unsigned long)tmp_inode->i_size, + (unsigned long long)tmp_inode->i_blocks, + tmp_inode->i_blksize)); if (S_ISREG(tmp_inode->i_mode)) { cFYI(1, ("File inode")); tmp_inode->i_op = &cifs_file_inode_ops; _