[GFS2] Fix sign problem in quota/statfs and cleanup _host structures (bb8d8a6f) · Commits · 戴 / test

fs/gfs2/Makefile

+1 −1

Original line number	Diff line number	Diff line
		obj-$(CONFIG_GFS2_FS) += gfs2.o
		gfs2-y := acl.o bmap.o daemon.o dir.o eaops.o eattr.o glock.o \
		glops.o inode.o lm.o log.o lops.o locking.o main.o meta_io.o \
		mount.o ondisk.o ops_address.o ops_dentry.o ops_export.o ops_file.o \
		mount.o ops_address.o ops_dentry.o ops_export.o ops_file.o \
		ops_fstype.o ops_inode.o ops_super.o ops_vm.o quota.o \
		recovery.o rgrp.o super.o sys.o trans.o util.o

fs/gfs2/bmap.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -718,7 +718,7 @@ static int do_strip(struct gfs2_inode ip, struct buffer_head dibh,
		for (x = 0; x < rlist.rl_rgrps; x++) {
		struct gfs2_rgrpd *rgd;
		rgd = rlist.rl_ghs[x].gh_gl->gl_object;
		rg_blocks += rgd->rd_ri.ri_length;
		rg_blocks += rgd->rd_length;
		}

		error = gfs2_glock_nq_m(rlist.rl_rgrps, rlist.rl_ghs);
		@@ -824,7 +824,7 @@ static int do_grow(struct gfs2_inode *ip, u64 size)
		goto out_gunlock_q;

		error = gfs2_trans_begin(sdp,
		sdp->sd_max_height + al->al_rgd->rd_ri.ri_length +
		sdp->sd_max_height + al->al_rgd->rd_length +
		RES_JDATA + RES_DINODE + RES_STATFS + RES_QUOTA, 0);
		if (error)
		goto out_ipres;

fs/gfs2/dir.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1897,7 +1897,7 @@ static int leaf_dealloc(struct gfs2_inode *dip, u32 index, u32 len,
		for (x = 0; x < rlist.rl_rgrps; x++) {
		struct gfs2_rgrpd *rgd;
		rgd = rlist.rl_ghs[x].gh_gl->gl_object;
		rg_blocks += rgd->rd_ri.ri_length;
		rg_blocks += rgd->rd_length;
		}

		error = gfs2_glock_nq_m(rlist.rl_rgrps, rlist.rl_ghs);

fs/gfs2/eattr.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -254,7 +254,7 @@ static int ea_dealloc_unstuffed(struct gfs2_inode ip, struct buffer_head bh,
		if (error)
		return error;

		error = gfs2_trans_begin(sdp, rgd->rd_ri.ri_length + RES_DINODE +
		error = gfs2_trans_begin(sdp, rgd->rd_length + RES_DINODE +
		RES_EATTR + RES_STATFS + RES_QUOTA, blks);
		if (error)
		goto out_gunlock;
		@@ -700,7 +700,7 @@ static int ea_alloc_skeleton(struct gfs2_inode ip, struct gfs2_ea_request er,
		goto out_gunlock_q;

		error = gfs2_trans_begin(GFS2_SB(&ip->i_inode),
		blks + al->al_rgd->rd_ri.ri_length +
		blks + al->al_rgd->rd_length +
		RES_DINODE + RES_STATFS + RES_QUOTA, 0);
		if (error)
		goto out_ipres;
		@@ -1352,7 +1352,7 @@ static int ea_dealloc_indirect(struct gfs2_inode *ip)
		for (x = 0; x < rlist.rl_rgrps; x++) {
		struct gfs2_rgrpd *rgd;
		rgd = rlist.rl_ghs[x].gh_gl->gl_object;
		rg_blocks += rgd->rd_ri.ri_length;
		rg_blocks += rgd->rd_length;
		}

		error = gfs2_glock_nq_m(rlist.rl_rgrps, rlist.rl_ghs);

fs/gfs2/incore.h

+62 −1

Original line number	Diff line number	Diff line
		@@ -28,6 +28,14 @@ struct gfs2_sbd;

		typedef void (gfs2_glop_bh_t) (struct gfs2_glock gl, unsigned int ret);

		struct gfs2_log_header_host {
		u64 lh_sequence; /* Sequence number of this transaction */
		u32 lh_flags; /* GFS2_LOG_HEAD_... */
		u32 lh_tail; /* Block number of log tail */
		u32 lh_blkno;
		u32 lh_hash;
		};

		/*
		* Structure of operations that are associated with each
		* type of element in the log.
		@@ -60,12 +68,23 @@ struct gfs2_bitmap {
		u32 bi_len;
		};

		struct gfs2_rgrp_host {
		u32 rg_flags;
		u32 rg_free;
		u32 rg_dinodes;
		u64 rg_igeneration;
		};

		struct gfs2_rgrpd {
		struct list_head rd_list; /* Link with superblock */
		struct list_head rd_list_mru;
		struct list_head rd_recent; /* Recently used rgrps */
		struct gfs2_glock rd_gl; / Glock for this rgrp */
		struct gfs2_rindex_host rd_ri;
		u64 rd_addr; /* grp block disk address */
		u64 rd_data0; /* first data location */
		u32 rd_length; /* length of rgrp header in fs blocks */
		u32 rd_data; /* num of data blocks in rgrp */
		u32 rd_bitbytes; /* number of bytes in data bitmaps */
		struct gfs2_rgrp_host rd_rg;
		u64 rd_rg_vn;
		struct gfs2_bitmap *rd_bits;
		@@ -211,6 +230,20 @@ enum {
		GIF_SW_PAGED = 3,
		};

		struct gfs2_dinode_host {
		u64 di_size; /* number of bytes in file */
		u64 di_blocks; /* number of blocks in file */
		u64 di_goal_meta; /* rgrp to alloc from next */
		u64 di_goal_data; /* data block goal */
		u64 di_generation; /* generation number for NFS */
		u32 di_flags; /* GFS2_DIF_... */
		u16 di_height; /* height of metadata */
		/* These only apply to directories */
		u16 di_depth; /* Number of bits in the table */
		u32 di_entries; /* The number of entries in the directory */
		u64 di_eattr; /* extended attribute block number */
		};

		struct gfs2_inode {
		struct inode i_inode;
		u64 i_no_addr;
		@@ -346,6 +379,12 @@ struct gfs2_jdesc {
		unsigned int jd_blocks;
		};

		struct gfs2_statfs_change_host {
		s64 sc_total;
		s64 sc_free;
		s64 sc_dinodes;
		};

		#define GFS2_GLOCKD_DEFAULT 1
		#define GFS2_GLOCKD_MAX 16

		@@ -418,6 +457,28 @@ enum {

		#define GFS2_FSNAME_LEN 256

		struct gfs2_inum_host {
		u64 no_formal_ino;
		u64 no_addr;
		};

		struct gfs2_sb_host {
		u32 sb_magic;
		u32 sb_type;
		u32 sb_format;

		u32 sb_fs_format;
		u32 sb_multihost_format;
		u32 sb_bsize;
		u32 sb_bsize_shift;

		struct gfs2_inum_host sb_master_dir;
		struct gfs2_inum_host sb_root_dir;

		char sb_lockproto[GFS2_LOCKNAME_LEN];
		char sb_locktable[GFS2_LOCKNAME_LEN];
		};

		struct gfs2_sbd {
		struct super_block *sd_vfs;
		struct super_block *sd_vfs_meta;

Admin message