Commit 77658aad authored by Steven Whitehouse's avatar Steven Whitehouse
Browse files

[GFS2] Eliminate (almost) duplicate field from gfs2_inode 



The blocks counter is almost a duplicate of the i_blocks
field in the VFS inode. The only difference is that i_blocks
can be only 32bits long for 32bit arch without large single file
support. Since GFS2 doesn't handle the non-large single file
case (for 32 bit anyway) this adds a new config dependency on
64BIT || LSF. This has always been the case, however we've never
explicitly said so before.

Even if we do add support for the non-LSF case, we will still
not require this field to be duplicated since we will not be
able to access oversized files anyway.

So the net result of all this is that we shave 8 bytes from a gfs2_inode
and get our config deps correct.

Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent 30cbf189

fs/gfs2/Kconfig

+1 −1
Original line number Diff line number Diff line 
config GFS2_FS

	tristate "GFS2 file system support"

	depends on EXPERIMENTAL

	depends on EXPERIMENTAL && (64BIT || LSF)

	select FS_POSIX_ACL

	select CRC32

	help

fs/gfs2/bmap.c

+6 −12
Original line number Diff line number Diff line
@@ -161,9 +161,8 @@ int gfs2_unstuff_dinode(struct gfs2_inode *ip, struct page *page) 


	if (ip->i_di.di_size) {

		*(__be64 *)(di + 1) = cpu_to_be64(block);

		ip->i_di.di_blocks++;

		gfs2_set_inode_blocks(&ip->i_inode);

		di->di_blocks = cpu_to_be64(ip->i_di.di_blocks);

		gfs2_add_inode_blocks(&ip->i_inode, 1);

		di->di_blocks = cpu_to_be64(gfs2_get_inode_blocks(&ip->i_inode));

	}



	ip->i_height = 1;
@@ -238,10 +237,9 @@ static int build_height(struct inode *inode, struct metapath *mp, unsigned heigh 
	gfs2_buffer_clear_tail(dibh, sizeof(struct gfs2_dinode));

	*(__be64 *)(di + 1) = cpu_to_be64(bn);

	ip->i_height += new_height;

	ip->i_di.di_blocks += new_height;

	gfs2_set_inode_blocks(&ip->i_inode);

	gfs2_add_inode_blocks(&ip->i_inode, new_height);

	di->di_height = cpu_to_be16(ip->i_height);

	di->di_blocks = cpu_to_be64(ip->i_di.di_blocks);

	di->di_blocks = cpu_to_be64(gfs2_get_inode_blocks(&ip->i_inode));

	brelse(dibh);

	return error;

}
@@ -380,8 +378,7 @@ static int lookup_block(struct gfs2_inode *ip, unsigned int height, 
	gfs2_trans_add_bh(ip->i_gl, mp->mp_bh[height], 1);



	*ptr = cpu_to_be64(*block);

	ip->i_di.di_blocks++;

	gfs2_set_inode_blocks(&ip->i_inode);

	gfs2_add_inode_blocks(&ip->i_inode, 1);



	*new = 1;

	return 0;
@@ -779,10 +776,7 @@ static int do_strip(struct gfs2_inode *ip, struct buffer_head *dibh, 
		}



		*p = 0;

		if (!ip->i_di.di_blocks)

			gfs2_consist_inode(ip);

		ip->i_di.di_blocks--;

		gfs2_set_inode_blocks(&ip->i_inode);

		gfs2_add_inode_blocks(&ip->i_inode, -1);

	}

	if (bstart) {

		if (metadata)

fs/gfs2/dir.c

+4 −11
Original line number Diff line number Diff line
@@ -906,8 +906,7 @@ static int dir_make_exhash(struct inode *inode) 
		*lp = cpu_to_be64(bn);



	dip->i_di.di_size = sdp->sd_sb.sb_bsize / 2;

	dip->i_di.di_blocks++;

	gfs2_set_inode_blocks(&dip->i_inode);

	gfs2_add_inode_blocks(&dip->i_inode, 1);

	dip->i_di.di_flags |= GFS2_DIF_EXHASH;



	for (x = sdp->sd_hash_ptrs, y = -1; x; x >>= 1, y++) ;
@@ -1045,8 +1044,7 @@ static int dir_split_leaf(struct inode *inode, const struct qstr *name) 
	error = gfs2_meta_inode_buffer(dip, &dibh);

	if (!gfs2_assert_withdraw(GFS2_SB(&dip->i_inode), !error)) {

		gfs2_trans_add_bh(dip->i_gl, dibh, 1);

		dip->i_di.di_blocks++;

		gfs2_set_inode_blocks(&dip->i_inode);

		gfs2_add_inode_blocks(&dip->i_inode, 1);

		gfs2_dinode_out(dip, dibh->b_data);

		brelse(dibh);

	}
@@ -1580,8 +1578,7 @@ static int dir_new_leaf(struct inode *inode, const struct qstr *name) 
	if (error)

		return error;

	gfs2_trans_add_bh(ip->i_gl, bh, 1);

	ip->i_di.di_blocks++;

	gfs2_set_inode_blocks(&ip->i_inode);

	gfs2_add_inode_blocks(&ip->i_inode, 1);

	gfs2_dinode_out(ip, bh->b_data);

	brelse(bh);

	return 0;
@@ -1922,11 +1919,7 @@ static int leaf_dealloc(struct gfs2_inode *dip, u32 index, u32 len, 
		brelse(bh);



		gfs2_free_meta(dip, blk, 1);



		if (!dip->i_di.di_blocks)

			gfs2_consist_inode(dip);

		dip->i_di.di_blocks--;

		gfs2_set_inode_blocks(&dip->i_inode);

		gfs2_add_inode_blocks(&dip->i_inode, -1);

	}



	error = gfs2_dir_write_data(dip, ht, index * sizeof(u64), size);

fs/gfs2/eattr.c

+6 −18
Original line number Diff line number Diff line
@@ -277,10 +277,7 @@ static int ea_dealloc_unstuffed(struct gfs2_inode *ip, struct buffer_head *bh, 
		}



		*dataptrs = 0;

		if (!ip->i_di.di_blocks)

			gfs2_consist_inode(ip);

		ip->i_di.di_blocks--;

		gfs2_set_inode_blocks(&ip->i_inode);

		gfs2_add_inode_blocks(&ip->i_inode, -1);

	}

	if (bstart)

		gfs2_free_meta(ip, bstart, blen);
@@ -598,8 +595,7 @@ static int ea_alloc_blk(struct gfs2_inode *ip, struct buffer_head **bhp) 
	ea->ea_flags = GFS2_EAFLAG_LAST;

	ea->ea_num_ptrs = 0;



	ip->i_di.di_blocks++;

	gfs2_set_inode_blocks(&ip->i_inode);

	gfs2_add_inode_blocks(&ip->i_inode, 1);



	return 0;

}
@@ -651,8 +647,7 @@ static int ea_write(struct gfs2_inode *ip, struct gfs2_ea_header *ea, 
			gfs2_trans_add_bh(ip->i_gl, bh, 1);

			gfs2_metatype_set(bh, GFS2_METATYPE_ED, GFS2_FORMAT_ED);



			ip->i_di.di_blocks++;

			gfs2_set_inode_blocks(&ip->i_inode);

			gfs2_add_inode_blocks(&ip->i_inode, 1);



			copy = data_len > sdp->sd_jbsize ? sdp->sd_jbsize :

							   data_len;
@@ -980,8 +975,7 @@ static int ea_set_block(struct gfs2_inode *ip, struct gfs2_ea_request *er, 
		*eablk = cpu_to_be64(ip->i_di.di_eattr);

		ip->i_di.di_eattr = blk;

		ip->i_di.di_flags |= GFS2_DIF_EA_INDIRECT;

		ip->i_di.di_blocks++;

		gfs2_set_inode_blocks(&ip->i_inode);

		gfs2_add_inode_blocks(&ip->i_inode, 1);



		eablk++;

	}
@@ -1389,10 +1383,7 @@ static int ea_dealloc_indirect(struct gfs2_inode *ip) 
		}



		*eablk = 0;

		if (!ip->i_di.di_blocks)

			gfs2_consist_inode(ip);

		ip->i_di.di_blocks--;

		gfs2_set_inode_blocks(&ip->i_inode);

		gfs2_add_inode_blocks(&ip->i_inode, -1);

	}

	if (bstart)

		gfs2_free_meta(ip, bstart, blen);
@@ -1444,10 +1435,7 @@ static int ea_dealloc_block(struct gfs2_inode *ip) 
	gfs2_free_meta(ip, ip->i_di.di_eattr, 1);



	ip->i_di.di_eattr = 0;

	if (!ip->i_di.di_blocks)

		gfs2_consist_inode(ip);

	ip->i_di.di_blocks--;

	gfs2_set_inode_blocks(&ip->i_inode);

	gfs2_add_inode_blocks(&ip->i_inode, -1);



	error = gfs2_meta_inode_buffer(ip, &dibh);

	if (!error) {

fs/gfs2/incore.h

+0 −1
Original line number Diff line number Diff line
@@ -239,7 +239,6 @@ enum { 


struct gfs2_dinode_host {

	u64 di_size;		/* number of bytes in file */

	u64 di_blocks;		/* number of blocks in file */

	u64 di_generation;	/* generation number for NFS */

	u32 di_flags;		/* GFS2_DIF_... */

	/* These only apply to directories  */

CRA Git | Maintained and supported by SUSTech CRA and CCSE