diff options
author | Mark Fasheh <mark.fasheh@oracle.com> | 2007-07-20 14:58:36 -0400 |
---|---|---|
committer | Mark Fasheh <mark.fasheh@oracle.com> | 2007-08-09 20:25:27 -0400 |
commit | 7c08d70c69150148c14f02633855f1591219c37c (patch) | |
tree | d33828db9b500afbd2168e9667dddb8450683804 /fs/ocfs2/file.c | |
parent | a00cce356b5592208e761525a48a25902322cce9 (diff) |
ocfs2: Fix some casting errors related to file writes
ocfs2_align_clusters_to_page_index() needs to cast the clusters shift to
pgoff_t and ocfs2_file_buffered_write() needs loff_t when calculating
destination start for memcpy.
Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
Diffstat (limited to 'fs/ocfs2/file.c')
-rw-r--r-- | fs/ocfs2/file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c index 7e508e2942ca..b1ae4c754157 100644 --- a/fs/ocfs2/file.c +++ b/fs/ocfs2/file.c | |||
@@ -1959,7 +1959,7 @@ static ssize_t ocfs2_file_buffered_write(struct file *file, loff_t *ppos, | |||
1959 | } | 1959 | } |
1960 | 1960 | ||
1961 | dst = kmap_atomic(page, KM_USER0); | 1961 | dst = kmap_atomic(page, KM_USER0); |
1962 | memcpy(dst + (pos & (PAGE_CACHE_SIZE - 1)), buf, bytes); | 1962 | memcpy(dst + (pos & (loff_t)(PAGE_CACHE_SIZE - 1)), buf, bytes); |
1963 | kunmap_atomic(dst, KM_USER0); | 1963 | kunmap_atomic(dst, KM_USER0); |
1964 | flush_dcache_page(page); | 1964 | flush_dcache_page(page); |
1965 | ocfs2_put_write_source(user_page); | 1965 | ocfs2_put_write_source(user_page); |