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>

1 files changed, 4 insertions, 4 deletions

diff --git a/fs/ocfs2/ocfs2.h b/fs/ocfs2/ocfs2.h
index 5cc90a40b3c5..58307853fb4a 100644
--- a/fs/ocfs2/ocfs2.h
+++ b/fs/ocfs2/ocfs2.h
@@ -494,16 +494,16 @@ static inline unsigned int ocfs2_page_index_to_clusters(struct super_block *sb,
 /*
  * Find the 1st page index which covers the given clusters.
  */
-static inline unsigned long ocfs2_align_clusters_to_page_index(struct super_block *sb,
+static inline pgoff_t ocfs2_align_clusters_to_page_index(struct super_block *sb,
                                                         u32 clusters)
 {
         unsigned int cbits = OCFS2_SB(sb)->s_clustersize_bits;
-        unsigned long index = clusters;
+        pgoff_t index = clusters;
 
         if (PAGE_CACHE_SHIFT > cbits) {
-                index = clusters >> (PAGE_CACHE_SHIFT - cbits);
+                index = (pgoff_t)clusters >> (PAGE_CACHE_SHIFT - cbits);
         } else if (PAGE_CACHE_SHIFT < cbits) {
-                index = clusters << (cbits - PAGE_CACHE_SHIFT);
+                index = (pgoff_t)clusters << (cbits - PAGE_CACHE_SHIFT);
         }
 
         return index;