Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f50dfaf7 authored by Al Viro's avatar Al Viro Committed by Steven Whitehouse
Browse files

[GFS2] split gfs2_sb 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent 5c6edb57

fs/gfs2/incore.h

+1 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ static void gfs2_meta_header_print(const struct gfs2_meta_header *mh) 
	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;

fs/gfs2/super.c

+1 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 


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
Original line number Diff line number Diff line
@@ -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 @@ struct gfs2_quota_change { 


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);