diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2006-10-13 20:45:02 -0400 |
---|---|---|
committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-11-30 10:33:00 -0500 |
commit | f50dfaf78c01df3cc2d8819f07d6661915567bae (patch) | |
tree | 23946491603726753015645e8332a3715cd6207d | |
parent | 5c6edb576f3800723bb65dbfaff82517089e32d0 (diff) |
[GFS2] split gfs2_sb
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
-rw-r--r-- | fs/gfs2/incore.h | 2 | ||||
-rw-r--r-- | fs/gfs2/ondisk.c | 2 | ||||
-rw-r--r-- | fs/gfs2/super.c | 2 | ||||
-rw-r--r-- | fs/gfs2/super.h | 2 | ||||
-rw-r--r-- | include/linux/gfs2_ondisk.h | 22 |
5 files changed, 25 insertions, 5 deletions
diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h index 1c876e0fb44a..bd596ba74e56 100644 --- a/fs/gfs2/incore.h +++ b/fs/gfs2/incore.h | |||
@@ -450,7 +450,7 @@ struct gfs2_sbd { | |||
450 | struct super_block *sd_vfs_meta; | 450 | struct super_block *sd_vfs_meta; |
451 | struct kobject sd_kobj; | 451 | struct kobject sd_kobj; |
452 | unsigned long sd_flags; /* SDF_... */ | 452 | unsigned long sd_flags; /* SDF_... */ |
453 | struct gfs2_sb sd_sb; | 453 | struct gfs2_sb_host sd_sb; |
454 | 454 | ||
455 | /* Constants computed on mount */ | 455 | /* Constants computed on mount */ |
456 | 456 | ||
diff --git a/fs/gfs2/ondisk.c b/fs/gfs2/ondisk.c index 52cb9a2dc058..5b32f1a35794 100644 --- a/fs/gfs2/ondisk.c +++ b/fs/gfs2/ondisk.c | |||
@@ -79,7 +79,7 @@ static void gfs2_meta_header_print(const struct gfs2_meta_header *mh) | |||
79 | pv(mh, mh_format, "%u"); | 79 | pv(mh, mh_format, "%u"); |
80 | } | 80 | } |
81 | 81 | ||
82 | void gfs2_sb_in(struct gfs2_sb *sb, const void *buf) | 82 | void gfs2_sb_in(struct gfs2_sb_host *sb, const void *buf) |
83 | { | 83 | { |
84 | const struct gfs2_sb *str = buf; | 84 | const struct gfs2_sb *str = buf; |
85 | 85 | ||
diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c index 6a78b1b32e25..52aa3221fc99 100644 --- a/fs/gfs2/super.c +++ b/fs/gfs2/super.c | |||
@@ -97,7 +97,7 @@ void gfs2_tune_init(struct gfs2_tune *gt) | |||
97 | * changed. | 97 | * changed. |
98 | */ | 98 | */ |
99 | 99 | ||
100 | int gfs2_check_sb(struct gfs2_sbd *sdp, struct gfs2_sb *sb, int silent) | 100 | int gfs2_check_sb(struct gfs2_sbd *sdp, struct gfs2_sb_host *sb, int silent) |
101 | { | 101 | { |
102 | unsigned int x; | 102 | unsigned int x; |
103 | 103 | ||
diff --git a/fs/gfs2/super.h b/fs/gfs2/super.h index 5bb443ae0f59..ac95064c1e5a 100644 --- a/fs/gfs2/super.h +++ b/fs/gfs2/super.h | |||
@@ -14,7 +14,7 @@ | |||
14 | 14 | ||
15 | void gfs2_tune_init(struct gfs2_tune *gt); | 15 | void gfs2_tune_init(struct gfs2_tune *gt); |
16 | 16 | ||
17 | int gfs2_check_sb(struct gfs2_sbd *sdp, struct gfs2_sb *sb, int silent); | 17 | int gfs2_check_sb(struct gfs2_sbd *sdp, struct gfs2_sb_host *sb, int silent); |
18 | int gfs2_read_sb(struct gfs2_sbd *sdp, struct gfs2_glock *gl, int silent); | 18 | int gfs2_read_sb(struct gfs2_sbd *sdp, struct gfs2_glock *gl, int silent); |
19 | struct page *gfs2_read_super(struct super_block *sb, sector_t sector); | 19 | struct page *gfs2_read_super(struct super_block *sb, sector_t sector); |
20 | 20 | ||
diff --git a/include/linux/gfs2_ondisk.h b/include/linux/gfs2_ondisk.h index 0e67a89a9699..b7bdfef82e4e 100644 --- a/include/linux/gfs2_ondisk.h +++ b/include/linux/gfs2_ondisk.h | |||
@@ -128,6 +128,26 @@ struct gfs2_sb { | |||
128 | /* In gfs1, quota and license dinodes followed */ | 128 | /* In gfs1, quota and license dinodes followed */ |
129 | }; | 129 | }; |
130 | 130 | ||
131 | struct gfs2_sb_host { | ||
132 | struct gfs2_meta_header sb_header; | ||
133 | |||
134 | __be32 sb_fs_format; | ||
135 | __be32 sb_multihost_format; | ||
136 | __u32 __pad0; /* Was superblock flags in gfs1 */ | ||
137 | |||
138 | __be32 sb_bsize; | ||
139 | __be32 sb_bsize_shift; | ||
140 | __u32 __pad1; /* Was journal segment size in gfs1 */ | ||
141 | |||
142 | struct gfs2_inum sb_master_dir; /* Was jindex dinode in gfs1 */ | ||
143 | struct gfs2_inum __pad2; /* Was rindex dinode in gfs1 */ | ||
144 | struct gfs2_inum sb_root_dir; | ||
145 | |||
146 | char sb_lockproto[GFS2_LOCKNAME_LEN]; | ||
147 | char sb_locktable[GFS2_LOCKNAME_LEN]; | ||
148 | /* In gfs1, quota and license dinodes followed */ | ||
149 | }; | ||
150 | |||
131 | /* | 151 | /* |
132 | * resource index structure | 152 | * resource index structure |
133 | */ | 153 | */ |
@@ -450,7 +470,7 @@ struct gfs2_quota_change { | |||
450 | 470 | ||
451 | extern void gfs2_inum_in(struct gfs2_inum *no, const void *buf); | 471 | extern void gfs2_inum_in(struct gfs2_inum *no, const void *buf); |
452 | extern void gfs2_inum_out(const struct gfs2_inum *no, void *buf); | 472 | extern void gfs2_inum_out(const struct gfs2_inum *no, void *buf); |
453 | extern void gfs2_sb_in(struct gfs2_sb *sb, const void *buf); | 473 | extern void gfs2_sb_in(struct gfs2_sb_host *sb, const void *buf); |
454 | extern void gfs2_rindex_in(struct gfs2_rindex *ri, const void *buf); | 474 | extern void gfs2_rindex_in(struct gfs2_rindex *ri, const void *buf); |
455 | extern void gfs2_rindex_out(const struct gfs2_rindex *ri, void *buf); | 475 | extern void gfs2_rindex_out(const struct gfs2_rindex *ri, void *buf); |
456 | extern void gfs2_rgrp_in(struct gfs2_rgrp *rg, const void *buf); | 476 | extern void gfs2_rgrp_in(struct gfs2_rgrp *rg, const void *buf); |