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

Commit 350a9b0a authored by Steven Whitehouse's avatar Steven Whitehouse
Browse files

GFS2: Split gfs2_trans_add_bh() into two 



There is little common content in gfs2_trans_add_bh() between the data
and meta classes by the time that the functions which it calls are
taken into account. The intent here is to split this into two
separate functions. Stage one is to introduce gfs2_trans_add_data()
and gfs2_trans_add_meta() and update the callers accordingly.

Later patches will then pull in the content of gfs2_trans_add_bh()
and its dependent functions in order to clean up the code in this
area.

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

fs/gfs2/aops.c

+2 −2
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ static void gfs2_page_add_databufs(struct gfs2_inode *ip, struct page *page, 
			continue;

		if (gfs2_is_jdata(ip))

			set_buffer_uptodate(bh);

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

		gfs2_trans_add_data(ip->i_gl, bh);

	}

}
@@ -852,7 +852,7 @@ static int gfs2_write_end(struct file *file, struct address_space *mapping, 
		goto failed;

	}



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

	gfs2_trans_add_meta(ip->i_gl, dibh);



	if (gfs2_is_stuffed(ip))

		return gfs2_stuffed_write_end(inode, dibh, pos, len, copied, page);

fs/gfs2/bmap.c

+12 −12
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ static int gfs2_unstuffer_page(struct gfs2_inode *ip, struct buffer_head *dibh, 
	if (!gfs2_is_jdata(ip))

		mark_buffer_dirty(bh);

	if (!gfs2_is_writeback(ip))

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

		gfs2_trans_add_data(ip->i_gl, bh);



	if (release) {

		unlock_page(page);
@@ -153,7 +153,7 @@ int gfs2_unstuff_dinode(struct gfs2_inode *ip, struct page *page) 


	/*  Set up the pointer to the new block  */



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

	gfs2_trans_add_meta(ip->i_gl, dibh);

	di = (struct gfs2_dinode *)dibh->b_data;

	gfs2_buffer_clear_tail(dibh, sizeof(struct gfs2_dinode));
@@ -405,7 +405,7 @@ static inline __be64 *gfs2_indirect_init(struct metapath *mp, 
	BUG_ON(i < 1);

	BUG_ON(mp->mp_bh[i] != NULL);

	mp->mp_bh[i] = gfs2_meta_new(gl, bn);

	gfs2_trans_add_bh(gl, mp->mp_bh[i], 1);

	gfs2_trans_add_meta(gl, mp->mp_bh[i]);

	gfs2_metatype_set(mp->mp_bh[i], GFS2_METATYPE_IN, GFS2_FORMAT_IN);

	gfs2_buffer_clear_tail(mp->mp_bh[i], sizeof(struct gfs2_meta_header));

	ptr += offset;
@@ -468,7 +468,7 @@ static int gfs2_bmap_alloc(struct inode *inode, const sector_t lblock, 
	BUG_ON(sheight < 1);

	BUG_ON(dibh == NULL);



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

	gfs2_trans_add_meta(ip->i_gl, dibh);



	if (height == sheight) {

		struct buffer_head *bh;
@@ -544,7 +544,7 @@ static int gfs2_bmap_alloc(struct inode *inode, const sector_t lblock, 
		/* Branching from existing tree */

		case ALLOC_GROW_DEPTH:

			if (i > 1 && i < height)

				gfs2_trans_add_bh(ip->i_gl, mp->mp_bh[i-1], 1);

				gfs2_trans_add_meta(ip->i_gl, mp->mp_bh[i-1]);

			for (; i < height && n > 0; i++, n--)

				gfs2_indirect_init(mp, ip->i_gl, i,

						   mp->mp_list[i-1], bn++);
@@ -556,7 +556,7 @@ static int gfs2_bmap_alloc(struct inode *inode, const sector_t lblock, 
		case ALLOC_DATA:

			BUG_ON(n > dblks);

			BUG_ON(mp->mp_bh[end_of_metadata] == NULL);

			gfs2_trans_add_bh(ip->i_gl, mp->mp_bh[end_of_metadata], 1);

			gfs2_trans_add_meta(ip->i_gl, mp->mp_bh[end_of_metadata]);

			dblks = n;

			ptr = metapointer(end_of_metadata, mp);

			dblock = bn;
@@ -796,8 +796,8 @@ static int do_strip(struct gfs2_inode *ip, struct buffer_head *dibh, 


	down_write(&ip->i_rw_mutex);



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

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

	gfs2_trans_add_meta(ip->i_gl, dibh);

	gfs2_trans_add_meta(ip->i_gl, bh);



	bstart = 0;

	blen = 0;
@@ -981,7 +981,7 @@ static int gfs2_block_truncate_page(struct address_space *mapping, loff_t from) 
	}



	if (!gfs2_is_writeback(ip))

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

		gfs2_trans_add_data(ip->i_gl, bh);



	zero_user(page, offset, length);

	mark_buffer_dirty(bh);
@@ -1046,7 +1046,7 @@ static int trunc_start(struct inode *inode, u64 oldsize, u64 newsize) 
	if (error)

		goto out;



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

	gfs2_trans_add_meta(ip->i_gl, dibh);



	if (gfs2_is_stuffed(ip)) {

		gfs2_buffer_clear_tail(dibh, sizeof(struct gfs2_dinode) + newsize);
@@ -1141,7 +1141,7 @@ static int trunc_end(struct gfs2_inode *ip) 
	ip->i_inode.i_mtime = ip->i_inode.i_ctime = CURRENT_TIME;

	ip->i_diskflags &= ~GFS2_DIF_TRUNC_IN_PROG;



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

	gfs2_trans_add_meta(ip->i_gl, dibh);

	gfs2_dinode_out(ip, dibh->b_data);

	brelse(dibh);
@@ -1246,7 +1246,7 @@ static int do_grow(struct inode *inode, u64 size) 


	i_size_write(inode, size);

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

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

	gfs2_trans_add_meta(ip->i_gl, dibh);

	gfs2_dinode_out(ip, dibh->b_data);

	brelse(dibh);

fs/gfs2/dir.c

+15 −15
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ int gfs2_dir_get_new_buffer(struct gfs2_inode *ip, u64 block, 
	struct buffer_head *bh;



	bh = gfs2_meta_new(ip->i_gl, block);

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

	gfs2_trans_add_meta(ip->i_gl, bh);

	gfs2_metatype_set(bh, GFS2_METATYPE_JD, GFS2_FORMAT_JD);

	gfs2_buffer_clear_tail(bh, sizeof(struct gfs2_meta_header));

	*bhp = bh;
@@ -127,7 +127,7 @@ static int gfs2_dir_write_stuffed(struct gfs2_inode *ip, const char *buf, 
	if (error)

		return error;



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

	gfs2_trans_add_meta(ip->i_gl, dibh);

	memcpy(dibh->b_data + offset + sizeof(struct gfs2_dinode), buf, size);

	if (ip->i_inode.i_size < offset + size)

		i_size_write(&ip->i_inode, offset + size);
@@ -209,7 +209,7 @@ static int gfs2_dir_write_data(struct gfs2_inode *ip, const char *buf, 
		if (error)

			goto fail;



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

		gfs2_trans_add_meta(ip->i_gl, bh);

		memcpy(bh->b_data + o, buf, amount);

		brelse(bh);
@@ -231,7 +231,7 @@ static int gfs2_dir_write_data(struct gfs2_inode *ip, const char *buf, 
		i_size_write(&ip->i_inode, offset + copied);

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



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

	gfs2_trans_add_meta(ip->i_gl, dibh);

	gfs2_dinode_out(ip, dibh->b_data);

	brelse(dibh);
@@ -647,7 +647,7 @@ static void dirent_del(struct gfs2_inode *dip, struct buffer_head *bh, 
		return;

	}



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

	gfs2_trans_add_meta(dip->i_gl, bh);



	/* If there is no prev entry, this is the first entry in the block.

	   The de_rec_len is already as big as it needs to be.  Just zero
@@ -690,7 +690,7 @@ static struct gfs2_dirent *gfs2_init_dirent(struct inode *inode, 
		offset = GFS2_DIRENT_SIZE(be16_to_cpu(dent->de_name_len));

	totlen = be16_to_cpu(dent->de_rec_len);

	BUG_ON(offset + name->len > totlen);

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

	gfs2_trans_add_meta(ip->i_gl, bh);

	ndent = (struct gfs2_dirent *)((char *)dent + offset);

	dent->de_rec_len = cpu_to_be16(offset);

	gfs2_qstr2dirent(name, totlen - offset, ndent);
@@ -831,7 +831,7 @@ static struct gfs2_leaf *new_leaf(struct inode *inode, struct buffer_head **pbh, 
		return NULL;



	gfs2_trans_add_unrevoke(GFS2_SB(inode), bn, 1);

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

	gfs2_trans_add_meta(ip->i_gl, bh);

	gfs2_metatype_set(bh, GFS2_METATYPE_LF, GFS2_FORMAT_LF);

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

	leaf->lf_depth = cpu_to_be16(depth);
@@ -916,7 +916,7 @@ static int dir_make_exhash(struct inode *inode) 
	/*  We're done with the new leaf block, now setup the new

	    hash table.  */



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

	gfs2_trans_add_meta(dip->i_gl, dibh);

	gfs2_buffer_clear_tail(dibh, sizeof(struct gfs2_dinode));



	lp = (__be64 *)(dibh->b_data + sizeof(struct gfs2_dinode));
@@ -976,7 +976,7 @@ static int dir_split_leaf(struct inode *inode, const struct qstr *name) 
		return 1; /* can't split */

	}



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

	gfs2_trans_add_meta(dip->i_gl, obh);



	nleaf = new_leaf(inode, &nbh, be16_to_cpu(oleaf->lf_depth) + 1);

	if (!nleaf) {
@@ -1069,7 +1069,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);

		gfs2_trans_add_meta(dip->i_gl, dibh);

		gfs2_add_inode_blocks(&dip->i_inode, 1);

		gfs2_dinode_out(dip, dibh->b_data);

		brelse(dibh);
@@ -1622,7 +1622,7 @@ static int dir_new_leaf(struct inode *inode, const struct qstr *name) 
			return error;

	} while(1);



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

	gfs2_trans_add_meta(ip->i_gl, obh);



	leaf = new_leaf(inode, &bh, be16_to_cpu(oleaf->lf_depth));

	if (!leaf) {
@@ -1636,7 +1636,7 @@ static int dir_new_leaf(struct inode *inode, const struct qstr *name) 
	error = gfs2_meta_inode_buffer(ip, &bh);

	if (error)

		return error;

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

	gfs2_trans_add_meta(ip->i_gl, bh);

	gfs2_add_inode_blocks(&ip->i_inode, 1);

	gfs2_dinode_out(ip, bh->b_data);

	brelse(bh);
@@ -1795,7 +1795,7 @@ int gfs2_dir_mvino(struct gfs2_inode *dip, const struct qstr *filename, 
	if (IS_ERR(dent))

		return PTR_ERR(dent);



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

	gfs2_trans_add_meta(dip->i_gl, bh);

	gfs2_inum_out(nip, dent);

	dent->de_type = cpu_to_be16(new_type);
@@ -1804,7 +1804,7 @@ int gfs2_dir_mvino(struct gfs2_inode *dip, const struct qstr *filename, 
		error = gfs2_meta_inode_buffer(dip, &bh);

		if (error)

			return error;

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

		gfs2_trans_add_meta(dip->i_gl, bh);

	}



	dip->i_inode.i_mtime = dip->i_inode.i_ctime = CURRENT_TIME;
@@ -1917,7 +1917,7 @@ static int leaf_dealloc(struct gfs2_inode *dip, u32 index, u32 len, 
	if (error)

		goto out_end_trans;



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

	gfs2_trans_add_meta(dip->i_gl, dibh);

	/* On the last dealloc, make this a regular file in case we crash.

	   (We don't want to free these blocks a second time.)  */

	if (last_dealloc)

fs/gfs2/file.c

+2 −2
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ static int do_gfs2_set_flags(struct file *filp, u32 reqflags, u32 mask) 
	error = gfs2_meta_inode_buffer(ip, &bh);

	if (error)

		goto out_trans_end;

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

	gfs2_trans_add_meta(ip->i_gl, bh);

	ip->i_diskflags = new_flags;

	gfs2_dinode_out(ip, bh->b_data);

	brelse(bh);
@@ -709,7 +709,7 @@ static int fallocate_chunk(struct inode *inode, loff_t offset, loff_t len, 
	if (unlikely(error))

		return error;



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

	gfs2_trans_add_meta(ip->i_gl, dibh);



	if (gfs2_is_stuffed(ip)) {

		error = gfs2_unstuff_dinode(ip, NULL);

fs/gfs2/inode.c

+4 −4
Original line number Diff line number Diff line
@@ -447,7 +447,7 @@ static void init_dinode(struct gfs2_inode *dip, struct gfs2_inode *ip, 
	struct timespec tv = CURRENT_TIME;



	dibh = gfs2_meta_new(ip->i_gl, ip->i_no_addr);

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

	gfs2_trans_add_meta(ip->i_gl, dibh);

	gfs2_metatype_set(dibh, GFS2_METATYPE_DI, GFS2_FORMAT_DI);

	gfs2_buffer_clear_tail(dibh, sizeof(struct gfs2_dinode));

	di = (struct gfs2_dinode *)dibh->b_data;
@@ -584,7 +584,7 @@ static int link_dinode(struct gfs2_inode *dip, const struct qstr *name, 
	if (error)

		goto fail_end_trans;

	set_nlink(&ip->i_inode, S_ISDIR(ip->i_inode.i_mode) ? 2 : 1);

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

	gfs2_trans_add_meta(ip->i_gl, dibh);

	gfs2_dinode_out(ip, dibh->b_data);

	brelse(dibh);

	return 0;
@@ -931,7 +931,7 @@ static int gfs2_link(struct dentry *old_dentry, struct inode *dir, 
	if (error)

		goto out_brelse;



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

	gfs2_trans_add_meta(ip->i_gl, dibh);

	inc_nlink(&ip->i_inode);

	ip->i_inode.i_ctime = CURRENT_TIME;

	ihold(inode);
@@ -1412,7 +1412,7 @@ static int gfs2_rename(struct inode *odir, struct dentry *odentry, 
		if (error)

			goto out_end_trans;

		ip->i_inode.i_ctime = CURRENT_TIME;

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

		gfs2_trans_add_meta(ip->i_gl, dibh);

		gfs2_dinode_out(ip, dibh->b_data);

		brelse(dibh);

	}