From 72a3c7695f98ca8c21c633fe63f350ed660a3b89 Mon Sep 17 00:00:00 2001 From: Jan Kara Date: Wed, 19 Dec 2007 15:25:42 +0100 Subject: [PATCH] --- yaml --- r: 76955 b: refs/heads/master c: 634bf74d1e8a8d06727505ea4eb73e780d7aa246 h: refs/heads/master i: 76953: 07ed14e899b1a0e3dd9ff480e412399a07e983cf 76951: 45412815ee82e744455093a096f5c9fd795b7b4d v: v3 --- [refs] | 2 +- trunk/fs/ocfs2/file.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3fdf5a69361b..9a2eb85c4516 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 32c3c0e2e515197ad240f5104116254975e6bbce +refs/heads/master: 634bf74d1e8a8d06727505ea4eb73e780d7aa246 diff --git a/trunk/fs/ocfs2/file.c b/trunk/fs/ocfs2/file.c index 6ebc9f9ec52c..ed5d5232e85d 100644 --- a/trunk/fs/ocfs2/file.c +++ b/trunk/fs/ocfs2/file.c @@ -626,7 +626,7 @@ int ocfs2_lock_allocators(struct inode *inode, struct ocfs2_dinode *di, mlog(0, "extend inode %llu, i_size = %lld, di->i_clusters = %u, " "clusters_to_add = %u, extents_to_split = %u\n", - (unsigned long long)OCFS2_I(inode)->ip_blkno, i_size_read(inode), + (unsigned long long)OCFS2_I(inode)->ip_blkno, (long long)i_size_read(inode), le32_to_cpu(di->i_clusters), clusters_to_add, extents_to_split); num_free_extents = ocfs2_num_free_extents(osb, inode, di); @@ -807,7 +807,7 @@ static int __ocfs2_extend_allocation(struct inode *inode, u32 logical_start, le32_to_cpu(fe->i_clusters), (unsigned long long)le64_to_cpu(fe->i_size)); mlog(0, "inode: ip_clusters=%u, i_size=%lld\n", - OCFS2_I(inode)->ip_clusters, i_size_read(inode)); + OCFS2_I(inode)->ip_clusters, (long long)i_size_read(inode)); leave: if (handle) {