lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[GFS2] split gfs2_sb

Browse Source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
This commit is contained in:
Al Viro
2006-10-13 20:45:02 -04:00
committed by Steven Whitehouse
parent 5c6edb576f
commit f50dfaf78c
5 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fs/gfs2/incore.h
View File

@@ -450,7 +450,7 @@ struct gfs2_sbd {
struct super_block *sd_vfs_meta; struct super_block *sd_vfs_meta;
struct kobject sd_kobj; struct kobject sd_kobj;
unsigned long sd_flags; /* SDF_... */ unsigned long sd_flags; /* SDF_... */
struct gfs2_sb sd_sb; struct gfs2_sb_host sd_sb;
/* Constants computed on mount */ /* Constants computed on mount */

2
fs/gfs2/ondisk.c
View File

@@ -79,7 +79,7 @@ static void gfs2_meta_header_print(const struct gfs2_meta_header *mh)
pv(mh, mh_format, "%u"); pv(mh, mh_format, "%u");
} }
void gfs2_sb_in(struct gfs2_sb *sb, const void *buf) void gfs2_sb_in(struct gfs2_sb_host *sb, const void *buf)
{ {
const struct gfs2_sb *str = buf; const struct gfs2_sb *str = buf;

2
fs/gfs2/super.c
View File

@@ -97,7 +97,7 @@ void gfs2_tune_init(struct gfs2_tune *gt)
* changed. * changed.
*/ */
int gfs2_check_sb(struct gfs2_sbd *sdp, struct gfs2_sb *sb, int silent) int gfs2_check_sb(struct gfs2_sbd *sdp, struct gfs2_sb_host *sb, int silent)
{ {
unsigned int x; unsigned int x;

2
fs/gfs2/super.h
View File

@@ -14,7 +14,7 @@
void gfs2_tune_init(struct gfs2_tune *gt); void gfs2_tune_init(struct gfs2_tune *gt);
int gfs2_check_sb(struct gfs2_sbd *sdp, struct gfs2_sb *sb, int silent); int gfs2_check_sb(struct gfs2_sbd *sdp, struct gfs2_sb_host *sb, int silent);
int gfs2_read_sb(struct gfs2_sbd *sdp, struct gfs2_glock *gl, int silent); int gfs2_read_sb(struct gfs2_sbd *sdp, struct gfs2_glock *gl, int silent);
struct page *gfs2_read_super(struct super_block *sb, sector_t sector); struct page *gfs2_read_super(struct super_block *sb, sector_t sector);

22
include/linux/gfs2_ondisk.h
View File

@@ -128,6 +128,26 @@ struct gfs2_sb {
/* In gfs1, quota and license dinodes followed */ /* In gfs1, quota and license dinodes followed */
}; };
struct gfs2_sb_host {
struct gfs2_meta_header sb_header;
__be32 sb_fs_format;
__be32 sb_multihost_format;
__u32 __pad0; /* Was superblock flags in gfs1 */
__be32 sb_bsize;
__be32 sb_bsize_shift;
__u32 __pad1; /* Was journal segment size in gfs1 */
struct gfs2_inum sb_master_dir; /* Was jindex dinode in gfs1 */
struct gfs2_inum __pad2; /* Was rindex dinode in gfs1 */
struct gfs2_inum sb_root_dir;
char sb_lockproto[GFS2_LOCKNAME_LEN];
char sb_locktable[GFS2_LOCKNAME_LEN];
/* In gfs1, quota and license dinodes followed */
};
/* /*
* resource index structure * resource index structure
*/ */
@@ -450,7 +470,7 @@ struct gfs2_quota_change {
extern void gfs2_inum_in(struct gfs2_inum *no, const void *buf); extern void gfs2_inum_in(struct gfs2_inum *no, const void *buf);
extern void gfs2_inum_out(const struct gfs2_inum *no, void *buf); extern void gfs2_inum_out(const struct gfs2_inum *no, void *buf);
extern void gfs2_sb_in(struct gfs2_sb *sb, const void *buf); extern void gfs2_sb_in(struct gfs2_sb_host *sb, const void *buf);
extern void gfs2_rindex_in(struct gfs2_rindex *ri, const void *buf); extern void gfs2_rindex_in(struct gfs2_rindex *ri, const void *buf);
extern void gfs2_rindex_out(const struct gfs2_rindex *ri, void *buf); extern void gfs2_rindex_out(const struct gfs2_rindex *ri, void *buf);
extern void gfs2_rgrp_in(struct gfs2_rgrp *rg, const void *buf); extern void gfs2_rgrp_in(struct gfs2_rgrp *rg, const void *buf);