diff options
Diffstat (limited to 'fs/ocfs2/file.c')
-rw-r--r-- | fs/ocfs2/file.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c index 520a2a6d7670..9395b4fa547d 100644 --- a/fs/ocfs2/file.c +++ b/fs/ocfs2/file.c | |||
@@ -207,10 +207,10 @@ out: | |||
207 | return ret; | 207 | return ret; |
208 | } | 208 | } |
209 | 209 | ||
210 | int ocfs2_set_inode_size(handle_t *handle, | 210 | static int ocfs2_set_inode_size(handle_t *handle, |
211 | struct inode *inode, | 211 | struct inode *inode, |
212 | struct buffer_head *fe_bh, | 212 | struct buffer_head *fe_bh, |
213 | u64 new_i_size) | 213 | u64 new_i_size) |
214 | { | 214 | { |
215 | int status; | 215 | int status; |
216 | 216 | ||
@@ -713,7 +713,8 @@ restarted_transaction: | |||
713 | } | 713 | } |
714 | 714 | ||
715 | mlog(0, "fe: i_clusters = %u, i_size=%llu\n", | 715 | mlog(0, "fe: i_clusters = %u, i_size=%llu\n", |
716 | fe->i_clusters, (unsigned long long)fe->i_size); | 716 | le32_to_cpu(fe->i_clusters), |
717 | (unsigned long long)le64_to_cpu(fe->i_size)); | ||
717 | mlog(0, "inode: ip_clusters=%u, i_size=%lld\n", | 718 | mlog(0, "inode: ip_clusters=%u, i_size=%lld\n", |
718 | OCFS2_I(inode)->ip_clusters, i_size_read(inode)); | 719 | OCFS2_I(inode)->ip_clusters, i_size_read(inode)); |
719 | 720 | ||
@@ -1853,6 +1854,9 @@ const struct file_operations ocfs2_fops = { | |||
1853 | .aio_read = ocfs2_file_aio_read, | 1854 | .aio_read = ocfs2_file_aio_read, |
1854 | .aio_write = ocfs2_file_aio_write, | 1855 | .aio_write = ocfs2_file_aio_write, |
1855 | .ioctl = ocfs2_ioctl, | 1856 | .ioctl = ocfs2_ioctl, |
1857 | #ifdef CONFIG_COMPAT | ||
1858 | .compat_ioctl = ocfs2_compat_ioctl, | ||
1859 | #endif | ||
1856 | .splice_read = ocfs2_file_splice_read, | 1860 | .splice_read = ocfs2_file_splice_read, |
1857 | .splice_write = ocfs2_file_splice_write, | 1861 | .splice_write = ocfs2_file_splice_write, |
1858 | }; | 1862 | }; |
@@ -1862,4 +1866,7 @@ const struct file_operations ocfs2_dops = { | |||
1862 | .readdir = ocfs2_readdir, | 1866 | .readdir = ocfs2_readdir, |
1863 | .fsync = ocfs2_sync_file, | 1867 | .fsync = ocfs2_sync_file, |
1864 | .ioctl = ocfs2_ioctl, | 1868 | .ioctl = ocfs2_ioctl, |
1869 | #ifdef CONFIG_COMPAT | ||
1870 | .compat_ioctl = ocfs2_compat_ioctl, | ||
1871 | #endif | ||
1865 | }; | 1872 | }; |