aboutsummaryrefslogtreecommitdiffstats
path: root/fs/gfs2/ops_address.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/gfs2/ops_address.c')
-rw-r--r--fs/gfs2/ops_address.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/gfs2/ops_address.c b/fs/gfs2/ops_address.c
index 21ae9e4f0f6c..ae9c46e75392 100644
--- a/fs/gfs2/ops_address.c
+++ b/fs/gfs2/ops_address.c
@@ -66,7 +66,7 @@ int gfs2_get_block(struct inode *inode, sector_t lblock,
66 struct buffer_head *bh_result, int create) 66 struct buffer_head *bh_result, int create)
67{ 67{
68 int new = create; 68 int new = create;
69 uint64_t dblock; 69 u64 dblock;
70 int error; 70 int error;
71 int boundary; 71 int boundary;
72 72
@@ -100,7 +100,7 @@ static int get_block_noalloc(struct inode *inode, sector_t lblock,
100 struct buffer_head *bh_result, int create) 100 struct buffer_head *bh_result, int create)
101{ 101{
102 int new = 0; 102 int new = 0;
103 uint64_t dblock; 103 u64 dblock;
104 int error; 104 int error;
105 int boundary; 105 int boundary;
106 106
@@ -510,10 +510,10 @@ static int gfs2_commit_write(struct file *file, struct page *page,
510 gfs2_trans_add_bh(ip->i_gl, dibh, 1); 510 gfs2_trans_add_bh(ip->i_gl, dibh, 1);
511 511
512 if (gfs2_is_stuffed(ip)) { 512 if (gfs2_is_stuffed(ip)) {
513 uint64_t file_size; 513 u64 file_size;
514 void *kaddr; 514 void *kaddr;
515 515
516 file_size = ((uint64_t)page->index << PAGE_CACHE_SHIFT) + to; 516 file_size = ((u64)page->index << PAGE_CACHE_SHIFT) + to;
517 517
518 kaddr = kmap_atomic(page, KM_USER0); 518 kaddr = kmap_atomic(page, KM_USER0);
519 memcpy(dibh->b_data + sizeof(struct gfs2_dinode) + from, 519 memcpy(dibh->b_data + sizeof(struct gfs2_dinode) + from,