diff options
-rw-r--r-- | fs/gfs2/dir.c | 8 | ||||
-rw-r--r-- | fs/gfs2/dir.h | 8 | ||||
-rw-r--r-- | fs/gfs2/incore.h | 2 | ||||
-rw-r--r-- | fs/gfs2/inode.c | 22 | ||||
-rw-r--r-- | fs/gfs2/inode.h | 4 | ||||
-rw-r--r-- | fs/gfs2/ondisk.c | 6 | ||||
-rw-r--r-- | fs/gfs2/ops_dentry.c | 2 | ||||
-rw-r--r-- | fs/gfs2/ops_export.c | 8 | ||||
-rw-r--r-- | fs/gfs2/ops_export.h | 2 | ||||
-rw-r--r-- | fs/gfs2/ops_file.c | 2 | ||||
-rw-r--r-- | fs/gfs2/ops_fstype.c | 4 | ||||
-rw-r--r-- | include/linux/gfs2_ondisk.h | 19 |
12 files changed, 46 insertions, 41 deletions
diff --git a/fs/gfs2/dir.c b/fs/gfs2/dir.c index e24af28b1a12..d67a3760ca30 100644 --- a/fs/gfs2/dir.c +++ b/fs/gfs2/dir.c | |||
@@ -1194,7 +1194,7 @@ static int do_filldir_main(struct gfs2_inode *dip, u64 *offset, | |||
1194 | int *copied) | 1194 | int *copied) |
1195 | { | 1195 | { |
1196 | const struct gfs2_dirent *dent, *dent_next; | 1196 | const struct gfs2_dirent *dent, *dent_next; |
1197 | struct gfs2_inum inum; | 1197 | struct gfs2_inum_host inum; |
1198 | u64 off, off_next; | 1198 | u64 off, off_next; |
1199 | unsigned int x, y; | 1199 | unsigned int x, y; |
1200 | int run = 0; | 1200 | int run = 0; |
@@ -1456,7 +1456,7 @@ out: | |||
1456 | */ | 1456 | */ |
1457 | 1457 | ||
1458 | int gfs2_dir_search(struct inode *dir, const struct qstr *name, | 1458 | int gfs2_dir_search(struct inode *dir, const struct qstr *name, |
1459 | struct gfs2_inum *inum, unsigned int *type) | 1459 | struct gfs2_inum_host *inum, unsigned int *type) |
1460 | { | 1460 | { |
1461 | struct buffer_head *bh; | 1461 | struct buffer_head *bh; |
1462 | struct gfs2_dirent *dent; | 1462 | struct gfs2_dirent *dent; |
@@ -1531,7 +1531,7 @@ static int dir_new_leaf(struct inode *inode, const struct qstr *name) | |||
1531 | */ | 1531 | */ |
1532 | 1532 | ||
1533 | int gfs2_dir_add(struct inode *inode, const struct qstr *name, | 1533 | int gfs2_dir_add(struct inode *inode, const struct qstr *name, |
1534 | const struct gfs2_inum *inum, unsigned type) | 1534 | const struct gfs2_inum_host *inum, unsigned type) |
1535 | { | 1535 | { |
1536 | struct gfs2_inode *ip = GFS2_I(inode); | 1536 | struct gfs2_inode *ip = GFS2_I(inode); |
1537 | struct buffer_head *bh; | 1537 | struct buffer_head *bh; |
@@ -1666,7 +1666,7 @@ int gfs2_dir_del(struct gfs2_inode *dip, const struct qstr *name) | |||
1666 | */ | 1666 | */ |
1667 | 1667 | ||
1668 | int gfs2_dir_mvino(struct gfs2_inode *dip, const struct qstr *filename, | 1668 | int gfs2_dir_mvino(struct gfs2_inode *dip, const struct qstr *filename, |
1669 | struct gfs2_inum *inum, unsigned int new_type) | 1669 | struct gfs2_inum_host *inum, unsigned int new_type) |
1670 | { | 1670 | { |
1671 | struct buffer_head *bh; | 1671 | struct buffer_head *bh; |
1672 | struct gfs2_dirent *dent; | 1672 | struct gfs2_dirent *dent; |
diff --git a/fs/gfs2/dir.h b/fs/gfs2/dir.h index 371233419b07..b21b33668a5b 100644 --- a/fs/gfs2/dir.h +++ b/fs/gfs2/dir.h | |||
@@ -31,17 +31,17 @@ struct gfs2_inum; | |||
31 | typedef int (*gfs2_filldir_t) (void *opaque, | 31 | typedef int (*gfs2_filldir_t) (void *opaque, |
32 | const char *name, unsigned int length, | 32 | const char *name, unsigned int length, |
33 | u64 offset, | 33 | u64 offset, |
34 | struct gfs2_inum *inum, unsigned int type); | 34 | struct gfs2_inum_host *inum, unsigned int type); |
35 | 35 | ||
36 | int gfs2_dir_search(struct inode *dir, const struct qstr *filename, | 36 | int gfs2_dir_search(struct inode *dir, const struct qstr *filename, |
37 | struct gfs2_inum *inum, unsigned int *type); | 37 | struct gfs2_inum_host *inum, unsigned int *type); |
38 | int gfs2_dir_add(struct inode *inode, const struct qstr *filename, | 38 | int gfs2_dir_add(struct inode *inode, const struct qstr *filename, |
39 | const struct gfs2_inum *inum, unsigned int type); | 39 | const struct gfs2_inum_host *inum, unsigned int type); |
40 | int gfs2_dir_del(struct gfs2_inode *dip, const struct qstr *filename); | 40 | int gfs2_dir_del(struct gfs2_inode *dip, const struct qstr *filename); |
41 | int gfs2_dir_read(struct inode *inode, u64 * offset, void *opaque, | 41 | int gfs2_dir_read(struct inode *inode, u64 * offset, void *opaque, |
42 | gfs2_filldir_t filldir); | 42 | gfs2_filldir_t filldir); |
43 | int gfs2_dir_mvino(struct gfs2_inode *dip, const struct qstr *filename, | 43 | int gfs2_dir_mvino(struct gfs2_inode *dip, const struct qstr *filename, |
44 | struct gfs2_inum *new_inum, unsigned int new_type); | 44 | struct gfs2_inum_host *new_inum, unsigned int new_type); |
45 | 45 | ||
46 | int gfs2_dir_exhash_dealloc(struct gfs2_inode *dip); | 46 | int gfs2_dir_exhash_dealloc(struct gfs2_inode *dip); |
47 | 47 | ||
diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h index e4afc2c4d609..20c9b4f0e52f 100644 --- a/fs/gfs2/incore.h +++ b/fs/gfs2/incore.h | |||
@@ -224,7 +224,7 @@ enum { | |||
224 | 224 | ||
225 | struct gfs2_inode { | 225 | struct gfs2_inode { |
226 | struct inode i_inode; | 226 | struct inode i_inode; |
227 | struct gfs2_inum i_num; | 227 | struct gfs2_inum_host i_num; |
228 | 228 | ||
229 | unsigned long i_flags; /* GIF_... */ | 229 | unsigned long i_flags; /* GIF_... */ |
230 | 230 | ||
diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c index 7eb6b440da6d..dadd1f35c864 100644 --- a/fs/gfs2/inode.c +++ b/fs/gfs2/inode.c | |||
@@ -112,7 +112,7 @@ void gfs2_inode_attr_out(struct gfs2_inode *ip) | |||
112 | static int iget_test(struct inode *inode, void *opaque) | 112 | static int iget_test(struct inode *inode, void *opaque) |
113 | { | 113 | { |
114 | struct gfs2_inode *ip = GFS2_I(inode); | 114 | struct gfs2_inode *ip = GFS2_I(inode); |
115 | struct gfs2_inum *inum = opaque; | 115 | struct gfs2_inum_host *inum = opaque; |
116 | 116 | ||
117 | if (ip && ip->i_num.no_addr == inum->no_addr) | 117 | if (ip && ip->i_num.no_addr == inum->no_addr) |
118 | return 1; | 118 | return 1; |
@@ -123,19 +123,19 @@ static int iget_test(struct inode *inode, void *opaque) | |||
123 | static int iget_set(struct inode *inode, void *opaque) | 123 | static int iget_set(struct inode *inode, void *opaque) |
124 | { | 124 | { |
125 | struct gfs2_inode *ip = GFS2_I(inode); | 125 | struct gfs2_inode *ip = GFS2_I(inode); |
126 | struct gfs2_inum *inum = opaque; | 126 | struct gfs2_inum_host *inum = opaque; |
127 | 127 | ||
128 | ip->i_num = *inum; | 128 | ip->i_num = *inum; |
129 | return 0; | 129 | return 0; |
130 | } | 130 | } |
131 | 131 | ||
132 | struct inode *gfs2_ilookup(struct super_block *sb, struct gfs2_inum *inum) | 132 | struct inode *gfs2_ilookup(struct super_block *sb, struct gfs2_inum_host *inum) |
133 | { | 133 | { |
134 | return ilookup5(sb, (unsigned long)inum->no_formal_ino, | 134 | return ilookup5(sb, (unsigned long)inum->no_formal_ino, |
135 | iget_test, inum); | 135 | iget_test, inum); |
136 | } | 136 | } |
137 | 137 | ||
138 | static struct inode *gfs2_iget(struct super_block *sb, struct gfs2_inum *inum) | 138 | static struct inode *gfs2_iget(struct super_block *sb, struct gfs2_inum_host *inum) |
139 | { | 139 | { |
140 | return iget5_locked(sb, (unsigned long)inum->no_formal_ino, | 140 | return iget5_locked(sb, (unsigned long)inum->no_formal_ino, |
141 | iget_test, iget_set, inum); | 141 | iget_test, iget_set, inum); |
@@ -150,7 +150,7 @@ static struct inode *gfs2_iget(struct super_block *sb, struct gfs2_inum *inum) | |||
150 | * Returns: A VFS inode, or an error | 150 | * Returns: A VFS inode, or an error |
151 | */ | 151 | */ |
152 | 152 | ||
153 | struct inode *gfs2_inode_lookup(struct super_block *sb, struct gfs2_inum *inum, unsigned int type) | 153 | struct inode *gfs2_inode_lookup(struct super_block *sb, struct gfs2_inum_host *inum, unsigned int type) |
154 | { | 154 | { |
155 | struct inode *inode = gfs2_iget(sb, inum); | 155 | struct inode *inode = gfs2_iget(sb, inum); |
156 | struct gfs2_inode *ip = GFS2_I(inode); | 156 | struct gfs2_inode *ip = GFS2_I(inode); |
@@ -394,7 +394,7 @@ struct inode *gfs2_lookupi(struct inode *dir, const struct qstr *name, | |||
394 | struct super_block *sb = dir->i_sb; | 394 | struct super_block *sb = dir->i_sb; |
395 | struct gfs2_inode *dip = GFS2_I(dir); | 395 | struct gfs2_inode *dip = GFS2_I(dir); |
396 | struct gfs2_holder d_gh; | 396 | struct gfs2_holder d_gh; |
397 | struct gfs2_inum inum; | 397 | struct gfs2_inum_host inum; |
398 | unsigned int type; | 398 | unsigned int type; |
399 | int error = 0; | 399 | int error = 0; |
400 | struct inode *inode = NULL; | 400 | struct inode *inode = NULL; |
@@ -610,7 +610,7 @@ static void munge_mode_uid_gid(struct gfs2_inode *dip, unsigned int *mode, | |||
610 | *gid = current->fsgid; | 610 | *gid = current->fsgid; |
611 | } | 611 | } |
612 | 612 | ||
613 | static int alloc_dinode(struct gfs2_inode *dip, struct gfs2_inum *inum, | 613 | static int alloc_dinode(struct gfs2_inode *dip, struct gfs2_inum_host *inum, |
614 | u64 *generation) | 614 | u64 *generation) |
615 | { | 615 | { |
616 | struct gfs2_sbd *sdp = GFS2_SB(&dip->i_inode); | 616 | struct gfs2_sbd *sdp = GFS2_SB(&dip->i_inode); |
@@ -650,7 +650,7 @@ out: | |||
650 | */ | 650 | */ |
651 | 651 | ||
652 | static void init_dinode(struct gfs2_inode *dip, struct gfs2_glock *gl, | 652 | static void init_dinode(struct gfs2_inode *dip, struct gfs2_glock *gl, |
653 | const struct gfs2_inum *inum, unsigned int mode, | 653 | const struct gfs2_inum_host *inum, unsigned int mode, |
654 | unsigned int uid, unsigned int gid, | 654 | unsigned int uid, unsigned int gid, |
655 | const u64 *generation) | 655 | const u64 *generation) |
656 | { | 656 | { |
@@ -707,7 +707,7 @@ static void init_dinode(struct gfs2_inode *dip, struct gfs2_glock *gl, | |||
707 | } | 707 | } |
708 | 708 | ||
709 | static int make_dinode(struct gfs2_inode *dip, struct gfs2_glock *gl, | 709 | static int make_dinode(struct gfs2_inode *dip, struct gfs2_glock *gl, |
710 | unsigned int mode, const struct gfs2_inum *inum, | 710 | unsigned int mode, const struct gfs2_inum_host *inum, |
711 | const u64 *generation) | 711 | const u64 *generation) |
712 | { | 712 | { |
713 | struct gfs2_sbd *sdp = GFS2_SB(&dip->i_inode); | 713 | struct gfs2_sbd *sdp = GFS2_SB(&dip->i_inode); |
@@ -866,7 +866,7 @@ struct inode *gfs2_createi(struct gfs2_holder *ghs, const struct qstr *name, | |||
866 | struct gfs2_inode *dip = ghs->gh_gl->gl_object; | 866 | struct gfs2_inode *dip = ghs->gh_gl->gl_object; |
867 | struct inode *dir = &dip->i_inode; | 867 | struct inode *dir = &dip->i_inode; |
868 | struct gfs2_sbd *sdp = GFS2_SB(&dip->i_inode); | 868 | struct gfs2_sbd *sdp = GFS2_SB(&dip->i_inode); |
869 | struct gfs2_inum inum; | 869 | struct gfs2_inum_host inum; |
870 | int error; | 870 | int error; |
871 | u64 generation; | 871 | u64 generation; |
872 | 872 | ||
@@ -1018,7 +1018,7 @@ int gfs2_rmdiri(struct gfs2_inode *dip, const struct qstr *name, | |||
1018 | int gfs2_unlink_ok(struct gfs2_inode *dip, const struct qstr *name, | 1018 | int gfs2_unlink_ok(struct gfs2_inode *dip, const struct qstr *name, |
1019 | struct gfs2_inode *ip) | 1019 | struct gfs2_inode *ip) |
1020 | { | 1020 | { |
1021 | struct gfs2_inum inum; | 1021 | struct gfs2_inum_host inum; |
1022 | unsigned int type; | 1022 | unsigned int type; |
1023 | int error; | 1023 | int error; |
1024 | 1024 | ||
diff --git a/fs/gfs2/inode.h b/fs/gfs2/inode.h index f5d861760579..d699b9209750 100644 --- a/fs/gfs2/inode.h +++ b/fs/gfs2/inode.h | |||
@@ -27,8 +27,8 @@ static inline int gfs2_is_dir(struct gfs2_inode *ip) | |||
27 | 27 | ||
28 | void gfs2_inode_attr_in(struct gfs2_inode *ip); | 28 | void gfs2_inode_attr_in(struct gfs2_inode *ip); |
29 | void gfs2_inode_attr_out(struct gfs2_inode *ip); | 29 | void gfs2_inode_attr_out(struct gfs2_inode *ip); |
30 | struct inode *gfs2_inode_lookup(struct super_block *sb, struct gfs2_inum *inum, unsigned type); | 30 | struct inode *gfs2_inode_lookup(struct super_block *sb, struct gfs2_inum_host *inum, unsigned type); |
31 | struct inode *gfs2_ilookup(struct super_block *sb, struct gfs2_inum *inum); | 31 | struct inode *gfs2_ilookup(struct super_block *sb, struct gfs2_inum_host *inum); |
32 | 32 | ||
33 | int gfs2_inode_refresh(struct gfs2_inode *ip); | 33 | int gfs2_inode_refresh(struct gfs2_inode *ip); |
34 | 34 | ||
diff --git a/fs/gfs2/ondisk.c b/fs/gfs2/ondisk.c index c4e099d582f7..32f592f4a3c0 100644 --- a/fs/gfs2/ondisk.c +++ b/fs/gfs2/ondisk.c | |||
@@ -32,7 +32,7 @@ | |||
32 | * first arg: the cpu-order structure | 32 | * first arg: the cpu-order structure |
33 | */ | 33 | */ |
34 | 34 | ||
35 | void gfs2_inum_in(struct gfs2_inum *no, const void *buf) | 35 | void gfs2_inum_in(struct gfs2_inum_host *no, const void *buf) |
36 | { | 36 | { |
37 | const struct gfs2_inum *str = buf; | 37 | const struct gfs2_inum *str = buf; |
38 | 38 | ||
@@ -40,7 +40,7 @@ void gfs2_inum_in(struct gfs2_inum *no, const void *buf) | |||
40 | no->no_addr = be64_to_cpu(str->no_addr); | 40 | no->no_addr = be64_to_cpu(str->no_addr); |
41 | } | 41 | } |
42 | 42 | ||
43 | void gfs2_inum_out(const struct gfs2_inum *no, void *buf) | 43 | void gfs2_inum_out(const struct gfs2_inum_host *no, void *buf) |
44 | { | 44 | { |
45 | struct gfs2_inum *str = buf; | 45 | struct gfs2_inum *str = buf; |
46 | 46 | ||
@@ -48,7 +48,7 @@ void gfs2_inum_out(const struct gfs2_inum *no, void *buf) | |||
48 | str->no_addr = cpu_to_be64(no->no_addr); | 48 | str->no_addr = cpu_to_be64(no->no_addr); |
49 | } | 49 | } |
50 | 50 | ||
51 | static void gfs2_inum_print(const struct gfs2_inum *no) | 51 | static void gfs2_inum_print(const struct gfs2_inum_host *no) |
52 | { | 52 | { |
53 | printk(KERN_INFO " no_formal_ino = %llu\n", (unsigned long long)no->no_formal_ino); | 53 | printk(KERN_INFO " no_formal_ino = %llu\n", (unsigned long long)no->no_formal_ino); |
54 | printk(KERN_INFO " no_addr = %llu\n", (unsigned long long)no->no_addr); | 54 | printk(KERN_INFO " no_addr = %llu\n", (unsigned long long)no->no_addr); |
diff --git a/fs/gfs2/ops_dentry.c b/fs/gfs2/ops_dentry.c index 00041b1b8025..c36f9e342e66 100644 --- a/fs/gfs2/ops_dentry.c +++ b/fs/gfs2/ops_dentry.c | |||
@@ -43,7 +43,7 @@ static int gfs2_drevalidate(struct dentry *dentry, struct nameidata *nd) | |||
43 | struct inode *inode = dentry->d_inode; | 43 | struct inode *inode = dentry->d_inode; |
44 | struct gfs2_holder d_gh; | 44 | struct gfs2_holder d_gh; |
45 | struct gfs2_inode *ip; | 45 | struct gfs2_inode *ip; |
46 | struct gfs2_inum inum; | 46 | struct gfs2_inum_host inum; |
47 | unsigned int type; | 47 | unsigned int type; |
48 | int error; | 48 | int error; |
49 | 49 | ||
diff --git a/fs/gfs2/ops_export.c b/fs/gfs2/ops_export.c index 86127d93bd35..33423a5c329b 100644 --- a/fs/gfs2/ops_export.c +++ b/fs/gfs2/ops_export.c | |||
@@ -35,7 +35,7 @@ static struct dentry *gfs2_decode_fh(struct super_block *sb, | |||
35 | void *context) | 35 | void *context) |
36 | { | 36 | { |
37 | struct gfs2_fh_obj fh_obj; | 37 | struct gfs2_fh_obj fh_obj; |
38 | struct gfs2_inum *this, parent; | 38 | struct gfs2_inum_host *this, parent; |
39 | 39 | ||
40 | if (fh_type != fh_len) | 40 | if (fh_type != fh_len) |
41 | return NULL; | 41 | return NULL; |
@@ -114,12 +114,12 @@ static int gfs2_encode_fh(struct dentry *dentry, __u32 *fh, int *len, | |||
114 | } | 114 | } |
115 | 115 | ||
116 | struct get_name_filldir { | 116 | struct get_name_filldir { |
117 | struct gfs2_inum inum; | 117 | struct gfs2_inum_host inum; |
118 | char *name; | 118 | char *name; |
119 | }; | 119 | }; |
120 | 120 | ||
121 | static int get_name_filldir(void *opaque, const char *name, unsigned int length, | 121 | static int get_name_filldir(void *opaque, const char *name, unsigned int length, |
122 | u64 offset, struct gfs2_inum *inum, | 122 | u64 offset, struct gfs2_inum_host *inum, |
123 | unsigned int type) | 123 | unsigned int type) |
124 | { | 124 | { |
125 | struct get_name_filldir *gnfd = (struct get_name_filldir *)opaque; | 125 | struct get_name_filldir *gnfd = (struct get_name_filldir *)opaque; |
@@ -202,7 +202,7 @@ static struct dentry *gfs2_get_dentry(struct super_block *sb, void *inum_obj) | |||
202 | { | 202 | { |
203 | struct gfs2_sbd *sdp = sb->s_fs_info; | 203 | struct gfs2_sbd *sdp = sb->s_fs_info; |
204 | struct gfs2_fh_obj *fh_obj = (struct gfs2_fh_obj *)inum_obj; | 204 | struct gfs2_fh_obj *fh_obj = (struct gfs2_fh_obj *)inum_obj; |
205 | struct gfs2_inum *inum = &fh_obj->this; | 205 | struct gfs2_inum_host *inum = &fh_obj->this; |
206 | struct gfs2_holder i_gh, ri_gh, rgd_gh; | 206 | struct gfs2_holder i_gh, ri_gh, rgd_gh; |
207 | struct gfs2_rgrpd *rgd; | 207 | struct gfs2_rgrpd *rgd; |
208 | struct inode *inode; | 208 | struct inode *inode; |
diff --git a/fs/gfs2/ops_export.h b/fs/gfs2/ops_export.h index 09aca5046fb1..f925a955b3b8 100644 --- a/fs/gfs2/ops_export.h +++ b/fs/gfs2/ops_export.h | |||
@@ -15,7 +15,7 @@ | |||
15 | 15 | ||
16 | extern struct export_operations gfs2_export_ops; | 16 | extern struct export_operations gfs2_export_ops; |
17 | struct gfs2_fh_obj { | 17 | struct gfs2_fh_obj { |
18 | struct gfs2_inum this; | 18 | struct gfs2_inum_host this; |
19 | __u32 imode; | 19 | __u32 imode; |
20 | }; | 20 | }; |
21 | 21 | ||
diff --git a/fs/gfs2/ops_file.c b/fs/gfs2/ops_file.c index 3064f133bf3c..359965c368bf 100644 --- a/fs/gfs2/ops_file.c +++ b/fs/gfs2/ops_file.c | |||
@@ -139,7 +139,7 @@ static loff_t gfs2_llseek(struct file *file, loff_t offset, int origin) | |||
139 | */ | 139 | */ |
140 | 140 | ||
141 | static int filldir_func(void *opaque, const char *name, unsigned int length, | 141 | static int filldir_func(void *opaque, const char *name, unsigned int length, |
142 | u64 offset, struct gfs2_inum *inum, | 142 | u64 offset, struct gfs2_inum_host *inum, |
143 | unsigned int type) | 143 | unsigned int type) |
144 | { | 144 | { |
145 | struct filldir_reg *fdr = (struct filldir_reg *)opaque; | 145 | struct filldir_reg *fdr = (struct filldir_reg *)opaque; |
diff --git a/fs/gfs2/ops_fstype.c b/fs/gfs2/ops_fstype.c index 882873a6bd69..d14e139d2674 100644 --- a/fs/gfs2/ops_fstype.c +++ b/fs/gfs2/ops_fstype.c | |||
@@ -237,7 +237,7 @@ fail: | |||
237 | } | 237 | } |
238 | 238 | ||
239 | static struct inode *gfs2_lookup_root(struct super_block *sb, | 239 | static struct inode *gfs2_lookup_root(struct super_block *sb, |
240 | struct gfs2_inum *inum) | 240 | struct gfs2_inum_host *inum) |
241 | { | 241 | { |
242 | return gfs2_inode_lookup(sb, inum, DT_DIR); | 242 | return gfs2_inode_lookup(sb, inum, DT_DIR); |
243 | } | 243 | } |
@@ -246,7 +246,7 @@ static int init_sb(struct gfs2_sbd *sdp, int silent, int undo) | |||
246 | { | 246 | { |
247 | struct super_block *sb = sdp->sd_vfs; | 247 | struct super_block *sb = sdp->sd_vfs; |
248 | struct gfs2_holder sb_gh; | 248 | struct gfs2_holder sb_gh; |
249 | struct gfs2_inum *inum; | 249 | struct gfs2_inum_host *inum; |
250 | struct inode *inode; | 250 | struct inode *inode; |
251 | int error = 0; | 251 | int error = 0; |
252 | 252 | ||
diff --git a/include/linux/gfs2_ondisk.h b/include/linux/gfs2_ondisk.h index 7dd5e4c18a66..b16df6e8f55c 100644 --- a/include/linux/gfs2_ondisk.h +++ b/include/linux/gfs2_ondisk.h | |||
@@ -54,8 +54,13 @@ struct gfs2_inum { | |||
54 | __be64 no_addr; | 54 | __be64 no_addr; |
55 | }; | 55 | }; |
56 | 56 | ||
57 | static inline int gfs2_inum_equal(const struct gfs2_inum *ino1, | 57 | struct gfs2_inum_host { |
58 | const struct gfs2_inum *ino2) | 58 | __u64 no_formal_ino; |
59 | __u64 no_addr; | ||
60 | }; | ||
61 | |||
62 | static inline int gfs2_inum_equal(const struct gfs2_inum_host *ino1, | ||
63 | const struct gfs2_inum_host *ino2) | ||
59 | { | 64 | { |
60 | return ino1->no_formal_ino == ino2->no_formal_ino && | 65 | return ino1->no_formal_ino == ino2->no_formal_ino && |
61 | ino1->no_addr == ino2->no_addr; | 66 | ino1->no_addr == ino2->no_addr; |
@@ -143,8 +148,8 @@ struct gfs2_sb_host { | |||
143 | __u32 sb_bsize; | 148 | __u32 sb_bsize; |
144 | __u32 sb_bsize_shift; | 149 | __u32 sb_bsize_shift; |
145 | 150 | ||
146 | struct gfs2_inum sb_master_dir; /* Was jindex dinode in gfs1 */ | 151 | struct gfs2_inum_host sb_master_dir; /* Was jindex dinode in gfs1 */ |
147 | struct gfs2_inum sb_root_dir; | 152 | struct gfs2_inum_host sb_root_dir; |
148 | 153 | ||
149 | char sb_lockproto[GFS2_LOCKNAME_LEN]; | 154 | char sb_lockproto[GFS2_LOCKNAME_LEN]; |
150 | char sb_locktable[GFS2_LOCKNAME_LEN]; | 155 | char sb_locktable[GFS2_LOCKNAME_LEN]; |
@@ -313,7 +318,7 @@ struct gfs2_dinode { | |||
313 | struct gfs2_dinode_host { | 318 | struct gfs2_dinode_host { |
314 | struct gfs2_meta_header_host di_header; | 319 | struct gfs2_meta_header_host di_header; |
315 | 320 | ||
316 | struct gfs2_inum di_num; | 321 | struct gfs2_inum_host di_num; |
317 | 322 | ||
318 | __u32 di_mode; /* mode of file */ | 323 | __u32 di_mode; /* mode of file */ |
319 | __u32 di_uid; /* owner's user id */ | 324 | __u32 di_uid; /* owner's user id */ |
@@ -503,8 +508,8 @@ struct gfs2_quota_change { | |||
503 | #ifdef __KERNEL__ | 508 | #ifdef __KERNEL__ |
504 | /* Translation functions */ | 509 | /* Translation functions */ |
505 | 510 | ||
506 | extern void gfs2_inum_in(struct gfs2_inum *no, const void *buf); | 511 | extern void gfs2_inum_in(struct gfs2_inum_host *no, const void *buf); |
507 | extern void gfs2_inum_out(const struct gfs2_inum *no, void *buf); | 512 | extern void gfs2_inum_out(const struct gfs2_inum_host *no, void *buf); |
508 | extern void gfs2_sb_in(struct gfs2_sb_host *sb, const void *buf); | 513 | extern void gfs2_sb_in(struct gfs2_sb_host *sb, const void *buf); |
509 | extern void gfs2_rindex_in(struct gfs2_rindex_host *ri, const void *buf); | 514 | extern void gfs2_rindex_in(struct gfs2_rindex_host *ri, const void *buf); |
510 | extern void gfs2_rindex_out(const struct gfs2_rindex_host *ri, void *buf); | 515 | extern void gfs2_rindex_out(const struct gfs2_rindex_host *ri, void *buf); |