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

Commit 539e5d6b authored by Steven Whitehouse's avatar Steven Whitehouse
Browse files

[GFS2] Change argument of gfs2_dinode_out 



Everywhere this was called, a struct gfs2_inode was available,
but despite that, it was always called with a struct gfs2_dinode
as an argument. By making this change it paves the way to start
eliminating fields duplicated between the kernel's struct inode
and the struct gfs2_dinode.

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

fs/gfs2/acl.c

+1 −1
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ static int munge_mode(struct gfs2_inode *ip, mode_t mode) 
				(ip->i_di.di_mode & S_IFMT) == (mode & S_IFMT));

		ip->i_di.di_mode = mode;

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

		gfs2_dinode_out(&ip->i_di, dibh->b_data);

		gfs2_dinode_out(ip, dibh->b_data);

		brelse(dibh);

	}

fs/gfs2/bmap.c

+6 −6
Original line number Diff line number Diff line
@@ -498,7 +498,7 @@ static int gfs2_block_pointers(struct inode *inode, u64 lblock, int create, 
			error = gfs2_meta_inode_buffer(ip, &dibh);

			if (!error) {

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

				gfs2_dinode_out(&ip->i_di, dibh->b_data);

				gfs2_dinode_out(ip, dibh->b_data);

				brelse(dibh);

			}

			set_buffer_new(bh_map);
@@ -780,7 +780,7 @@ static int do_strip(struct gfs2_inode *ip, struct buffer_head *dibh, 


	ip->i_di.di_mtime = ip->i_di.di_ctime = get_seconds();



	gfs2_dinode_out(&ip->i_di, dibh->b_data);

	gfs2_dinode_out(ip, dibh->b_data);



	up_write(&ip->i_rw_mutex);
@@ -860,7 +860,7 @@ static int do_grow(struct gfs2_inode *ip, u64 size) 
		goto out_end_trans;



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

	gfs2_dinode_out(&ip->i_di, dibh->b_data);

	gfs2_dinode_out(ip, dibh->b_data);

	brelse(dibh);



out_end_trans:
@@ -970,7 +970,7 @@ static int trunc_start(struct gfs2_inode *ip, u64 size) 
		ip->i_di.di_size = size;

		ip->i_di.di_mtime = ip->i_di.di_ctime = get_seconds();

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

		gfs2_dinode_out(&ip->i_di, dibh->b_data);

		gfs2_dinode_out(ip, dibh->b_data);

		gfs2_buffer_clear_tail(dibh, sizeof(struct gfs2_dinode) + size);

		error = 1;
@@ -983,7 +983,7 @@ static int trunc_start(struct gfs2_inode *ip, u64 size) 
			ip->i_di.di_mtime = ip->i_di.di_ctime = get_seconds();

			ip->i_di.di_flags |= GFS2_DIF_TRUNC_IN_PROG;

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

			gfs2_dinode_out(&ip->i_di, dibh->b_data);

			gfs2_dinode_out(ip, dibh->b_data);

		}

	}
@@ -1057,7 +1057,7 @@ static int trunc_end(struct gfs2_inode *ip) 
	ip->i_di.di_flags &= ~GFS2_DIF_TRUNC_IN_PROG;



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

	gfs2_dinode_out(&ip->i_di, dibh->b_data);

	gfs2_dinode_out(ip, dibh->b_data);

	brelse(dibh);



out:

fs/gfs2/dir.c

+10 −10
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ static int gfs2_dir_write_stuffed(struct gfs2_inode *ip, const char *buf, 
	if (ip->i_di.di_size < offset + size)

		ip->i_di.di_size = offset + size;

	ip->i_di.di_mtime = ip->i_di.di_ctime = get_seconds();

	gfs2_dinode_out(&ip->i_di, dibh->b_data);

	gfs2_dinode_out(ip, dibh->b_data);



	brelse(dibh);
@@ -232,7 +232,7 @@ out: 
	ip->i_di.di_mtime = ip->i_di.di_ctime = get_seconds();



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

	gfs2_dinode_out(&ip->i_di, dibh->b_data);

	gfs2_dinode_out(ip, dibh->b_data);

	brelse(dibh);



	return copied;
@@ -907,7 +907,7 @@ static int dir_make_exhash(struct inode *inode) 
	for (x = sdp->sd_hash_ptrs, y = -1; x; x >>= 1, y++) ;

	dip->i_di.di_depth = y;



	gfs2_dinode_out(&dip->i_di, dibh->b_data);

	gfs2_dinode_out(dip, dibh->b_data);



	brelse(dibh);
@@ -1039,7 +1039,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)) {

		dip->i_di.di_blocks++;

		gfs2_dinode_out(&dip->i_di, dibh->b_data);

		gfs2_dinode_out(dip, dibh->b_data);

		brelse(dibh);

	}
@@ -1119,7 +1119,7 @@ static int dir_double_exhash(struct gfs2_inode *dip) 
	error = gfs2_meta_inode_buffer(dip, &dibh);

	if (!gfs2_assert_withdraw(sdp, !error)) {

		dip->i_di.di_depth++;

		gfs2_dinode_out(&dip->i_di, dibh->b_data);

		gfs2_dinode_out(dip, dibh->b_data);

		brelse(dibh);

	}
@@ -1517,7 +1517,7 @@ static int dir_new_leaf(struct inode *inode, const struct qstr *name) 
		return error;

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

	ip->i_di.di_blocks++;

	gfs2_dinode_out(&ip->i_di, bh->b_data);

	gfs2_dinode_out(ip, bh->b_data);

	brelse(bh);

	return 0;

}
@@ -1561,7 +1561,7 @@ int gfs2_dir_add(struct inode *inode, const struct qstr *name, 
			gfs2_trans_add_bh(ip->i_gl, bh, 1);

			ip->i_di.di_entries++;

			ip->i_di.di_mtime = ip->i_di.di_ctime = get_seconds();

			gfs2_dinode_out(&ip->i_di, bh->b_data);

			gfs2_dinode_out(ip, bh->b_data);

			brelse(bh);

			error = 0;

			break;
@@ -1647,7 +1647,7 @@ int gfs2_dir_del(struct gfs2_inode *dip, const struct qstr *name) 
	gfs2_trans_add_bh(dip->i_gl, bh, 1);

	dip->i_di.di_entries--;

	dip->i_di.di_mtime = dip->i_di.di_ctime = get_seconds();

	gfs2_dinode_out(&dip->i_di, bh->b_data);

	gfs2_dinode_out(dip, bh->b_data);

	brelse(bh);

	mark_inode_dirty(&dip->i_inode);
@@ -1695,7 +1695,7 @@ int gfs2_dir_mvino(struct gfs2_inode *dip, const struct qstr *filename, 
	}



	dip->i_di.di_mtime = dip->i_di.di_ctime = get_seconds();

	gfs2_dinode_out(&dip->i_di, bh->b_data);

	gfs2_dinode_out(dip, bh->b_data);

	brelse(bh);

	return 0;

}
@@ -1875,7 +1875,7 @@ static int leaf_dealloc(struct gfs2_inode *dip, u32 index, u32 len, 
		goto out_end_trans;



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

	gfs2_dinode_out(&dip->i_di, dibh->b_data);

	gfs2_dinode_out(dip, dibh->b_data);

	brelse(dibh);



out_end_trans:

fs/gfs2/eattr.c

+7 −7
Original line number Diff line number Diff line
@@ -302,7 +302,7 @@ static int ea_dealloc_unstuffed(struct gfs2_inode *ip, struct buffer_head *bh, 
	if (!error) {

		ip->i_di.di_ctime = get_seconds();

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

		gfs2_dinode_out(&ip->i_di, dibh->b_data);

		gfs2_dinode_out(ip, dibh->b_data);

		brelse(dibh);

	}
@@ -717,7 +717,7 @@ static int ea_alloc_skeleton(struct gfs2_inode *ip, struct gfs2_ea_request *er, 
		}

		ip->i_di.di_ctime = get_seconds();

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

		gfs2_dinode_out(&ip->i_di, dibh->b_data);

		gfs2_dinode_out(ip, dibh->b_data);

		brelse(dibh);

	}
@@ -852,7 +852,7 @@ static int ea_set_simple_noalloc(struct gfs2_inode *ip, struct buffer_head *bh, 
	}

	ip->i_di.di_ctime = get_seconds();

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

	gfs2_dinode_out(&ip->i_di, dibh->b_data);

	gfs2_dinode_out(ip, dibh->b_data);

	brelse(dibh);

out:

	gfs2_trans_end(GFS2_SB(&ip->i_inode));
@@ -1132,7 +1132,7 @@ static int ea_remove_stuffed(struct gfs2_inode *ip, struct gfs2_ea_location *el) 
	if (!error) {

		ip->i_di.di_ctime = get_seconds();

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

		gfs2_dinode_out(&ip->i_di, dibh->b_data);

		gfs2_dinode_out(ip, dibh->b_data);

		brelse(dibh);

	}
@@ -1287,7 +1287,7 @@ int gfs2_ea_acl_chmod(struct gfs2_inode *ip, struct gfs2_ea_location *el, 
		gfs2_assert_warn(GFS2_SB(&ip->i_inode), !error);

		gfs2_inode_attr_out(ip);

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

		gfs2_dinode_out(&ip->i_di, dibh->b_data);

		gfs2_dinode_out(ip, dibh->b_data);

		brelse(dibh);

	}
@@ -1397,7 +1397,7 @@ static int ea_dealloc_indirect(struct gfs2_inode *ip) 
	error = gfs2_meta_inode_buffer(ip, &dibh);

	if (!error) {

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

		gfs2_dinode_out(&ip->i_di, dibh->b_data);

		gfs2_dinode_out(ip, dibh->b_data);

		brelse(dibh);

	}
@@ -1446,7 +1446,7 @@ static int ea_dealloc_block(struct gfs2_inode *ip) 
	error = gfs2_meta_inode_buffer(ip, &dibh);

	if (!error) {

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

		gfs2_dinode_out(&ip->i_di, dibh->b_data);

		gfs2_dinode_out(ip, dibh->b_data);

		brelse(dibh);

	}

fs/gfs2/inode.c

+3 −3
Original line number Diff line number Diff line
@@ -338,7 +338,7 @@ int gfs2_change_nlink(struct gfs2_inode *ip, int diff) 
	ip->i_inode.i_nlink = nlink;



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

	gfs2_dinode_out(&ip->i_di, dibh->b_data);

	gfs2_dinode_out(ip, dibh->b_data);

	brelse(dibh);

	mark_inode_dirty(&ip->i_inode);
@@ -792,7 +792,7 @@ static int link_dinode(struct gfs2_inode *dip, const struct qstr *name, 
		goto fail_end_trans;

	ip->i_di.di_nlink = 1;

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

	gfs2_dinode_out(&ip->i_di, dibh->b_data);

	gfs2_dinode_out(ip, dibh->b_data);

	brelse(dibh);

	return 0;
@@ -1349,7 +1349,7 @@ __gfs2_setattr_simple(struct gfs2_inode *ip, struct iattr *attr) 
		gfs2_inode_attr_out(ip);



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

		gfs2_dinode_out(&ip->i_di, dibh->b_data);

		gfs2_dinode_out(ip, dibh->b_data);

		brelse(dibh);

	}

	return error;