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

Commit ab9bbda0 authored by Steven Whitehouse's avatar Steven Whitehouse
Browse files

GFS2: Use ->dirty_inode() 



The aim of this patch is to use the newly enhanced ->dirty_inode()
super block operation to deal with atime updates, rather than
piggy backing that code into ->write_inode() as is currently
done.

The net result is a simplification of the code in various places
and a reduction of the number of gfs2_dinode_out() calls since
this is now implied by ->dirty_inode().

Some of the mark_inode_dirty() calls have been moved under glocks
in order to take advantage of then being able to avoid locking in
->dirty_inode() when we already have suitable locks.

One consequence is that generic_write_end() now correctly deals
with file size updates, so that we do not need a separate check
for that afterwards. This also, indirectly, means that fdatasync
should work correctly on GFS2 - the current code always syncs the
metadata whether it needs to or not.

Has survived testing with postmark (with and without atime) and
also fsx.

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

fs/gfs2/acl.c

+3 −2
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ static int gfs2_set_mode(struct inode *inode, umode_t mode) 
		iattr.ia_valid = ATTR_MODE;

		iattr.ia_mode = mode;



		error = gfs2_setattr_simple(GFS2_I(inode), &iattr);

		error = gfs2_setattr_simple(inode, &iattr);

	}



	return error;
@@ -160,6 +160,7 @@ int gfs2_acl_create(struct gfs2_inode *dip, struct inode *inode) 


int gfs2_acl_chmod(struct gfs2_inode *ip, struct iattr *attr)

{

	struct inode *inode = &ip->i_inode;

	struct posix_acl *acl;

	char *data;

	unsigned int len;
@@ -169,7 +170,7 @@ int gfs2_acl_chmod(struct gfs2_inode *ip, struct iattr *attr) 
	if (IS_ERR(acl))

		return PTR_ERR(acl);

	if (!acl)

		return gfs2_setattr_simple(ip, attr);

		return gfs2_setattr_simple(inode, attr);



	error = posix_acl_chmod(&acl, GFP_NOFS, attr->ia_mode);

	if (error)

fs/gfs2/aops.c

+0 −6
Original line number Diff line number Diff line
@@ -787,7 +787,6 @@ static int gfs2_stuffed_write_end(struct inode *inode, struct buffer_head *dibh, 
	u64 to = pos + copied;

	void *kaddr;

	unsigned char *buf = dibh->b_data + sizeof(struct gfs2_dinode);

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



	BUG_ON((pos + len) > (dibh->b_size - sizeof(struct gfs2_dinode)));

	kaddr = kmap_atomic(page, KM_USER0);
@@ -804,7 +803,6 @@ static int gfs2_stuffed_write_end(struct inode *inode, struct buffer_head *dibh, 
	if (copied) {

		if (inode->i_size < to)

			i_size_write(inode, to);

		gfs2_dinode_out(ip, di);

		mark_inode_dirty(inode);

	}
@@ -873,10 +871,6 @@ static int gfs2_write_end(struct file *file, struct address_space *mapping, 
		gfs2_page_add_databufs(ip, page, from, to);



	ret = generic_write_end(file, mapping, pos, len, copied, page, fsdata);

	if (ret > 0) {

		gfs2_dinode_out(ip, dibh->b_data);

		mark_inode_dirty(inode);

	}



	if (inode == sdp->sd_rindex) {

		adjust_fs_space(inode);

fs/gfs2/dir.c

+1 −9
Original line number Diff line number Diff line
@@ -1681,7 +1681,6 @@ int gfs2_dir_del(struct gfs2_inode *dip, const struct dentry *dentry) 
	const struct qstr *name = &dentry->d_name;

	struct gfs2_dirent *dent, *prev = NULL;

	struct buffer_head *bh;

	int error;



	/* Returns _either_ the entry (if its first in block) or the

	   previous entry otherwise */
@@ -1710,22 +1709,15 @@ int gfs2_dir_del(struct gfs2_inode *dip, const struct dentry *dentry) 
	}

	brelse(bh);



	error = gfs2_meta_inode_buffer(dip, &bh);

	if (error)

		return error;



	if (!dip->i_entries)

		gfs2_consist_inode(dip);

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

	dip->i_entries--;

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

	if (S_ISDIR(dentry->d_inode->i_mode))

		drop_nlink(&dip->i_inode);

	gfs2_dinode_out(dip, bh->b_data);

	brelse(bh);

	mark_inode_dirty(&dip->i_inode);



	return error;

	return 0;

}



/**

fs/gfs2/file.c

+0 −1
Original line number Diff line number Diff line
@@ -802,7 +802,6 @@ static int fallocate_chunk(struct inode *inode, loff_t offset, loff_t len, 
		from = 0;

	}



	gfs2_dinode_out(ip, dibh->b_data);

	mark_inode_dirty(inode);



	brelse(dibh);

fs/gfs2/inode.c

+13 −30
Original line number Diff line number Diff line
@@ -729,8 +729,8 @@ static int gfs2_create_inode(struct inode *dir, struct dentry *dentry, 
		gfs2_inplace_release(dip);

	gfs2_quota_unlock(dip);

	gfs2_alloc_put(dip);

	gfs2_glock_dq_uninit_m(2, ghs);

	mark_inode_dirty(inode);

	gfs2_glock_dq_uninit_m(2, ghs);

	d_instantiate(dentry, inode);

	return 0;
@@ -926,8 +926,9 @@ static int gfs2_link(struct dentry *old_dentry, struct inode *dir, 
	gfs2_trans_add_bh(ip->i_gl, dibh, 1);

	inc_nlink(&ip->i_inode);

	ip->i_inode.i_ctime = CURRENT_TIME;

	gfs2_dinode_out(ip, dibh->b_data);

	mark_inode_dirty(&ip->i_inode);

	ihold(inode);

	d_instantiate(dentry, inode);

	mark_inode_dirty(inode);



out_brelse:

	brelse(dibh);
@@ -949,11 +950,6 @@ static int gfs2_link(struct dentry *old_dentry, struct inode *dir, 
out_parent:

	gfs2_holder_uninit(ghs);

	gfs2_holder_uninit(ghs + 1);

	if (!error) {

		ihold(inode);

		d_instantiate(dentry, inode);

		mark_inode_dirty(inode);

	}

	return error;

}
@@ -1026,8 +1022,6 @@ static int gfs2_unlink_inode(struct gfs2_inode *dip, 
		clear_nlink(inode);

	else

		drop_nlink(inode);

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

	gfs2_dinode_out(ip, bh->b_data);

	mark_inode_dirty(inode);

	if (inode->i_nlink == 0)

		gfs2_unlink_di(inode);
@@ -1565,21 +1559,10 @@ int gfs2_permission(struct inode *inode, int mask) 
	return error;

}



static int __gfs2_setattr_simple(struct gfs2_inode *ip, struct iattr *attr)

static int __gfs2_setattr_simple(struct inode *inode, struct iattr *attr)

{

	struct inode *inode = &ip->i_inode;

	struct buffer_head *dibh;

	int error;



	error = gfs2_meta_inode_buffer(ip, &dibh);

	if (error)

		return error;



	setattr_copy(inode, attr);

	mark_inode_dirty(inode);

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

	gfs2_dinode_out(ip, dibh->b_data);

	brelse(dibh);

	return 0;

}
@@ -1591,19 +1574,19 @@ static int __gfs2_setattr_simple(struct gfs2_inode *ip, struct iattr *attr) 
 * Returns: errno

 */



int gfs2_setattr_simple(struct gfs2_inode *ip, struct iattr *attr)

int gfs2_setattr_simple(struct inode *inode, struct iattr *attr)

{

	int error;



	if (current->journal_info)

		return __gfs2_setattr_simple(ip, attr);

		return __gfs2_setattr_simple(inode, attr);



	error = gfs2_trans_begin(GFS2_SB(&ip->i_inode), RES_DINODE, 0);

	error = gfs2_trans_begin(GFS2_SB(inode), RES_DINODE, 0);

	if (error)

		return error;



	error = __gfs2_setattr_simple(ip, attr);

	gfs2_trans_end(GFS2_SB(&ip->i_inode));

	error = __gfs2_setattr_simple(inode, attr);

	gfs2_trans_end(GFS2_SB(inode));

	return error;

}
@@ -1641,7 +1624,7 @@ static int setattr_chown(struct inode *inode, struct iattr *attr) 
	if (error)

		goto out_gunlock_q;



	error = gfs2_setattr_simple(ip, attr);

	error = gfs2_setattr_simple(inode, attr);

	if (error)

		goto out_end_trans;
@@ -1697,12 +1680,12 @@ static int gfs2_setattr(struct dentry *dentry, struct iattr *attr) 
	else if ((attr->ia_valid & ATTR_MODE) && IS_POSIXACL(inode))

		error = gfs2_acl_chmod(ip, attr);

	else

		error = gfs2_setattr_simple(ip, attr);

		error = gfs2_setattr_simple(inode, attr);



out:

	gfs2_glock_dq_uninit(&i_gh);

	if (!error)

		mark_inode_dirty(inode);

	gfs2_glock_dq_uninit(&i_gh);

	return error;

}