aboutsummaryrefslogtreecommitdiffstats
path: root/fs/gfs2/ops_export.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/gfs2/ops_export.c')
-rw-r--r--fs/gfs2/ops_export.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/gfs2/ops_export.c b/fs/gfs2/ops_export.c
index c94cbc8b6ef6..cf826893dd5f 100644
--- a/fs/gfs2/ops_export.c
+++ b/fs/gfs2/ops_export.c
@@ -46,15 +46,15 @@ static struct dentry *gfs2_decode_fh(struct super_block *sb,
46 46
47 switch (fh_type) { 47 switch (fh_type) {
48 case 10: 48 case 10:
49 parent.no_formal_ino = ((uint64_t)be32_to_cpu(fh[4])) << 32; 49 parent.no_formal_ino = ((u64)be32_to_cpu(fh[4])) << 32;
50 parent.no_formal_ino |= be32_to_cpu(fh[5]); 50 parent.no_formal_ino |= be32_to_cpu(fh[5]);
51 parent.no_addr = ((uint64_t)be32_to_cpu(fh[6])) << 32; 51 parent.no_addr = ((u64)be32_to_cpu(fh[6])) << 32;
52 parent.no_addr |= be32_to_cpu(fh[7]); 52 parent.no_addr |= be32_to_cpu(fh[7]);
53 fh_obj.imode = be32_to_cpu(fh[8]); 53 fh_obj.imode = be32_to_cpu(fh[8]);
54 case 4: 54 case 4:
55 this->no_formal_ino = ((uint64_t)be32_to_cpu(fh[0])) << 32; 55 this->no_formal_ino = ((u64)be32_to_cpu(fh[0])) << 32;
56 this->no_formal_ino |= be32_to_cpu(fh[1]); 56 this->no_formal_ino |= be32_to_cpu(fh[1]);
57 this->no_addr = ((uint64_t)be32_to_cpu(fh[2])) << 32; 57 this->no_addr = ((u64)be32_to_cpu(fh[2])) << 32;
58 this->no_addr |= be32_to_cpu(fh[3]); 58 this->no_addr |= be32_to_cpu(fh[3]);
59 break; 59 break;
60 default: 60 default:
@@ -118,7 +118,7 @@ struct get_name_filldir {
118}; 118};
119 119
120static int get_name_filldir(void *opaque, const char *name, unsigned int length, 120static int get_name_filldir(void *opaque, const char *name, unsigned int length,
121 uint64_t offset, struct gfs2_inum *inum, 121 u64 offset, struct gfs2_inum *inum,
122 unsigned int type) 122 unsigned int type)
123{ 123{
124 struct get_name_filldir *gnfd = (struct get_name_filldir *)opaque; 124 struct get_name_filldir *gnfd = (struct get_name_filldir *)opaque;
@@ -140,7 +140,7 @@ static int gfs2_get_name(struct dentry *parent, char *name,
140 struct gfs2_inode *dip, *ip; 140 struct gfs2_inode *dip, *ip;
141 struct get_name_filldir gnfd; 141 struct get_name_filldir gnfd;
142 struct gfs2_holder gh; 142 struct gfs2_holder gh;
143 uint64_t offset = 0; 143 u64 offset = 0;
144 int error; 144 int error;
145 145
146 if (!dir) 146 if (!dir)