split gfs2_sb [3/70]
Quoted 1 line
From
f50dfaf78c01df3cc2d8819f07d6661915567baeMon Sep 17 00:00:00 2001
From: Al Viro <[email protected]>
Date: Fri, 13 Oct 2006 20:45:02 -0400
Subject: [PATCH] [GFS2] split gfs2_sb
Signed-off-by Al Viro <[email protected]>
Signed-off-by Steven Whitehouse <[email protected]>
--- fs/gfs2/incore.h | 2 +- fs/gfs2/ondisk.c | 2 +- fs/gfs2/super.c | 2 +- fs/gfs2/super.h | 2 +- include/linux/gfs2_ondisk.h | 22 +++++++++++++++++++++- 5 files changed, 25 insertions(+), 5 deletions(-)
fs/gfs2/incore.h +1 -1
@@ -450,7 +450,7 @@ struct gfs2_sbd {struct super_block *sd_vfs_meta;struct kobject sd_kobj;unsigned long sd_flags;/* SDF_... */ -struct gfs2_sb sd_sb; +struct gfs2_sb_host sd_sb;/* Constants computed on mount */
fs/gfs2/ondisk.c +1 -1
@@ -79,7 +79,7 @@ static void gfs2_meta_header_print(constpv (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;
fs/gfs2/super.c +1 -1
@@ -97,7 +97,7 @@ void gfs2_tune_init(struct gfs2_tune *gt* 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;
fs/gfs2/super.h +1 -1
@@ -14,7 +14,7 @@ #include "incore.h"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);struct page *gfs2_read_super (struct super_block *sb,sector_t sector);
include/linux/gfs2_ondisk.h +21 -1
@@ -128,6 +128,26 @@ struct gfs2_sb {/* 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 */
@@ -450,7 +470,7 @@ #ifdef __KERNEL__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_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_out (const struct gfs2_rindex *ri,void *buf);extern void gfs2_rgrp_in (struct gfs2_rgrp *rg,const void *buf);
Signature · 1 line
1.4.1