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

Commit 383f01fb authored by Steven Whitehouse's avatar Steven Whitehouse
Browse files

GFS2: Banish struct gfs2_dinode_host 



The final field in gfs2_dinode_host was the i_flags field. Thats
renamed to i_diskflags in order to avoid confusion with the existing
inode flags, and moved into the inode proper at a suitable location
to avoid creating a "hole".

At that point struct gfs2_dinode_host is no longer needed and as
promised (quite some time ago!) it can now be removed completely.

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

fs/gfs2/bmap.c

+2 −2
Original line number Diff line number Diff line
@@ -1047,7 +1047,7 @@ static int trunc_start(struct gfs2_inode *ip, u64 size) 
		if (!error) {

			ip->i_disksize = size;

			ip->i_inode.i_mtime = ip->i_inode.i_ctime = CURRENT_TIME;

			ip->i_di.di_flags |= GFS2_DIF_TRUNC_IN_PROG;

			ip->i_diskflags |= GFS2_DIF_TRUNC_IN_PROG;

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

			gfs2_dinode_out(ip, dibh->b_data);

		}
@@ -1120,7 +1120,7 @@ static int trunc_end(struct gfs2_inode *ip) 
		gfs2_buffer_clear_tail(dibh, sizeof(struct gfs2_dinode));

	}

	ip->i_inode.i_mtime = ip->i_inode.i_ctime = CURRENT_TIME;

	ip->i_di.di_flags &= ~GFS2_DIF_TRUNC_IN_PROG;

	ip->i_diskflags &= ~GFS2_DIF_TRUNC_IN_PROG;



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

	gfs2_dinode_out(ip, dibh->b_data);

fs/gfs2/dir.c

+8 −8
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
 * the block.  In leaves, they begin at offset sizeof(struct gfs2_leaf) from the

 * beginning of the leaf block. The dirents reside in leaves when

 *

 * dip->i_di.di_flags & GFS2_DIF_EXHASH is true

 * dip->i_diskflags & GFS2_DIF_EXHASH is true

 *

 * Otherwise, the dirents are "linear", within a single stuffed dinode block.

 *
@@ -755,7 +755,7 @@ static struct gfs2_dirent *gfs2_dirent_search(struct inode *inode, 
	struct gfs2_inode *ip = GFS2_I(inode);

	int error;



	if (ip->i_di.di_flags & GFS2_DIF_EXHASH) {

	if (ip->i_diskflags & GFS2_DIF_EXHASH) {

		struct gfs2_leaf *leaf;

		unsigned hsize = 1 << ip->i_depth;

		unsigned index;
@@ -907,7 +907,7 @@ static int dir_make_exhash(struct inode *inode) 


	dip->i_disksize = sdp->sd_sb.sb_bsize / 2;

	gfs2_add_inode_blocks(&dip->i_inode, 1);

	dip->i_di.di_flags |= GFS2_DIF_EXHASH;

	dip->i_diskflags |= GFS2_DIF_EXHASH;



	for (x = sdp->sd_hash_ptrs, y = -1; x; x >>= 1, y++) ;

	dip->i_depth = y;
@@ -1429,7 +1429,7 @@ int gfs2_dir_read(struct inode *inode, u64 *offset, void *opaque, 
	if (!dip->i_entries)

		return 0;



	if (dip->i_di.di_flags & GFS2_DIF_EXHASH)

	if (dip->i_diskflags & GFS2_DIF_EXHASH)

		return dir_e_read(inode, offset, opaque, filldir);



	if (!gfs2_is_stuffed(dip)) {
@@ -1612,7 +1612,7 @@ int gfs2_dir_add(struct inode *inode, const struct qstr *name, 
			dent = gfs2_init_dirent(inode, dent, name, bh);

			gfs2_inum_out(nip, dent);

			dent->de_type = cpu_to_be16(type);

			if (ip->i_di.di_flags & GFS2_DIF_EXHASH) {

			if (ip->i_diskflags & GFS2_DIF_EXHASH) {

				leaf = (struct gfs2_leaf *)bh->b_data;

				be16_add_cpu(&leaf->lf_entries, 1);

			}
@@ -1628,7 +1628,7 @@ int gfs2_dir_add(struct inode *inode, const struct qstr *name, 
			error = 0;

			break;

		}

		if (!(ip->i_di.di_flags & GFS2_DIF_EXHASH)) {

		if (!(ip->i_diskflags & GFS2_DIF_EXHASH)) {

			error = dir_make_exhash(inode);

			if (error)

				break;
@@ -1691,7 +1691,7 @@ int gfs2_dir_del(struct gfs2_inode *dip, const struct qstr *name) 
	}



	dirent_del(dip, bh, prev, dent);

	if (dip->i_di.di_flags & GFS2_DIF_EXHASH) {

	if (dip->i_diskflags & GFS2_DIF_EXHASH) {

		struct gfs2_leaf *leaf = (struct gfs2_leaf *)bh->b_data;

		u16 entries = be16_to_cpu(leaf->lf_entries);

		if (!entries)
@@ -1748,7 +1748,7 @@ int gfs2_dir_mvino(struct gfs2_inode *dip, const struct qstr *filename, 
	gfs2_inum_out(nip, dent);

	dent->de_type = cpu_to_be16(new_type);



	if (dip->i_di.di_flags & GFS2_DIF_EXHASH) {

	if (dip->i_diskflags & GFS2_DIF_EXHASH) {

		brelse(bh);

		error = gfs2_meta_inode_buffer(dip, &bh);

		if (error)

fs/gfs2/eattr.c

+7 −7
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ static int ea_foreach(struct gfs2_inode *ip, ea_call_t ea_call, void *data) 
	if (error)

		return error;



	if (!(ip->i_di.di_flags & GFS2_DIF_EA_INDIRECT)) {

	if (!(ip->i_diskflags & GFS2_DIF_EA_INDIRECT)) {

		error = ea_foreach_i(ip, bh, ea_call, data);

		goto out;

	}
@@ -935,7 +935,7 @@ static int ea_set_block(struct gfs2_inode *ip, struct gfs2_ea_request *er, 
	int error;

	int mh_size = sizeof(struct gfs2_meta_header);



	if (ip->i_di.di_flags & GFS2_DIF_EA_INDIRECT) {

	if (ip->i_diskflags & GFS2_DIF_EA_INDIRECT) {

		__be64 *end;



		error = gfs2_meta_read(ip->i_gl, ip->i_eattr, DIO_WAIT,
@@ -974,7 +974,7 @@ static int ea_set_block(struct gfs2_inode *ip, struct gfs2_ea_request *er, 
		eablk = (__be64 *)(indbh->b_data + mh_size);

		*eablk = cpu_to_be64(ip->i_eattr);

		ip->i_eattr = blk;

		ip->i_di.di_flags |= GFS2_DIF_EA_INDIRECT;

		ip->i_diskflags |= GFS2_DIF_EA_INDIRECT;

		gfs2_add_inode_blocks(&ip->i_inode, 1);



		eablk++;
@@ -1015,7 +1015,7 @@ static int ea_set_i(struct gfs2_inode *ip, struct gfs2_ea_request *er, 
	if (error)

		return error;



	if (!(ip->i_di.di_flags & GFS2_DIF_EA_INDIRECT))

	if (!(ip->i_diskflags & GFS2_DIF_EA_INDIRECT))

		blks++;

	if (GFS2_EAREQ_SIZE_STUFFED(er) > GFS2_SB(&ip->i_inode)->sd_jbsize)

		blks += DIV_ROUND_UP(er->er_data_len, GFS2_SB(&ip->i_inode)->sd_jbsize);
@@ -1051,7 +1051,7 @@ int gfs2_ea_set_i(struct gfs2_inode *ip, struct gfs2_ea_request *er) 
		return error;



	if (el.el_ea) {

		if (ip->i_di.di_flags & GFS2_DIF_APPENDONLY) {

		if (ip->i_diskflags & GFS2_DIF_APPENDONLY) {

			brelse(el.el_bh);

			return -EPERM;

		}
@@ -1388,7 +1388,7 @@ static int ea_dealloc_indirect(struct gfs2_inode *ip) 
	if (bstart)

		gfs2_free_meta(ip, bstart, blen);



	ip->i_di.di_flags &= ~GFS2_DIF_EA_INDIRECT;

	ip->i_diskflags &= ~GFS2_DIF_EA_INDIRECT;



	error = gfs2_meta_inode_buffer(ip, &dibh);

	if (!error) {
@@ -1479,7 +1479,7 @@ int gfs2_ea_dealloc(struct gfs2_inode *ip) 
	if (error)

		goto out_rindex;



	if (ip->i_di.di_flags & GFS2_DIF_EA_INDIRECT) {

	if (ip->i_diskflags & GFS2_DIF_EA_INDIRECT) {

		error = ea_dealloc_indirect(ip);

		if (error)

			goto out_rindex;

fs/gfs2/glops.c

+1 −1
Original line number Diff line number Diff line
@@ -239,7 +239,7 @@ static int inode_go_lock(struct gfs2_holder *gh) 
			return error;

	}



	if ((ip->i_di.di_flags & GFS2_DIF_TRUNC_IN_PROG) &&

	if ((ip->i_diskflags & GFS2_DIF_TRUNC_IN_PROG) &&

	    (gl->gl_state == LM_ST_EXCLUSIVE) &&

	    (gh->gh_state == LM_ST_EXCLUSIVE))

		error = gfs2_truncatei_resume(ip);

fs/gfs2/incore.h

+1 −6
Original line number Diff line number Diff line
@@ -233,9 +233,6 @@ enum { 
	GIF_USER                = 4, /* user inode, not metadata addr space */

};



struct gfs2_dinode_host {

	u32 di_flags;		/* GFS2_DIF_... */

};



struct gfs2_inode {

	struct inode i_inode;
@@ -245,9 +242,6 @@ struct gfs2_inode { 
	u64 i_eattr;

	loff_t i_disksize;

	unsigned long i_flags;		/* GIF_... */



	struct gfs2_dinode_host i_di; /* To be replaced by ref to block */



	struct gfs2_glock *i_gl; /* Move into i_gh? */

	struct gfs2_holder i_iopen_gh;

	struct gfs2_holder i_gh; /* for prepare/commit_write only */
@@ -255,6 +249,7 @@ struct gfs2_inode { 
	u64 i_goal;	/* goal block for allocations */

	struct rw_semaphore i_rw_mutex;

	u32 i_entries;

	u32 i_diskflags;

	u8 i_height;

	u8 i_depth;

};