Commit 7005c3e4 authored by Steven Whitehouse's avatar Steven Whitehouse
Browse files

GFS2: Use range based functions for rgrp sync/invalidation 



Each rgrp header is represented as a single extent on disk, so we
can calculate the position within the address space, since we are
using address spaces mapped 1:1 to the disk. This means that it
is possible to use the range based versions of filemap_fdatawrite/wait
and for invalidating the page cache.

Our eventual intent is to then be able to merge the address spaces
used for rgrps into a single address space, rather than to have
one for each glock, saving memory and reducing complexity.

Since during umount, the rgrp structures are disposed of before
the glocks, we need to store the extent information in the glock
so that is is available for a final invalidation. This patch uses
a field which is otherwise unused in rgrp glocks to do that, so
that we do not have to expand the size of a glock.

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

fs/gfs2/glops.c

+3 −3
Original line number Diff line number Diff line
@@ -142,8 +142,8 @@ static void rgrp_go_sync(struct gfs2_glock *gl) 
	GLOCK_BUG_ON(gl, gl->gl_state != LM_ST_EXCLUSIVE);



	gfs2_log_flush(gl->gl_sbd, gl);

	filemap_fdatawrite(metamapping);

	error = filemap_fdatawait(metamapping);

	filemap_fdatawrite_range(metamapping, gl->gl_vm.start, gl->gl_vm.end);

	error = filemap_fdatawait_range(metamapping, gl->gl_vm.start, gl->gl_vm.end);

        mapping_set_error(metamapping, error);

	gfs2_ail_empty_gl(gl);
@@ -170,7 +170,7 @@ static void rgrp_go_inval(struct gfs2_glock *gl, int flags) 


	WARN_ON_ONCE(!(flags & DIO_METADATA));

	gfs2_assert_withdraw(gl->gl_sbd, !atomic_read(&gl->gl_ail_count));

	truncate_inode_pages(mapping, 0);

	truncate_inode_pages_range(mapping, gl->gl_vm.start, gl->gl_vm.end);



	if (gl->gl_object) {

		struct gfs2_rgrpd *rgd = (struct gfs2_rgrpd *)gl->gl_object;

fs/gfs2/incore.h

+9 −1
Original line number Diff line number Diff line
@@ -351,7 +351,15 @@ struct gfs2_glock { 
	atomic_t gl_ail_count;

	atomic_t gl_revokes;

	struct delayed_work gl_work;

	union {

		/* For inode and iopen glocks only */

		struct work_struct gl_delete;

		/* For rgrp glocks only */

		struct {

			loff_t start;

			loff_t end;

		} gl_vm;

	};

	struct rcu_head gl_rcu;

};

fs/gfs2/rgrp.c

+3 −0
Original line number Diff line number Diff line
@@ -886,6 +886,7 @@ static int rgd_insert(struct gfs2_rgrpd *rgd) 
static int read_rindex_entry(struct gfs2_inode *ip)

{

	struct gfs2_sbd *sdp = GFS2_SB(&ip->i_inode);

	const unsigned bsize = sdp->sd_sb.sb_bsize;

	loff_t pos = sdp->sd_rgrps * sizeof(struct gfs2_rindex);

	struct gfs2_rindex buf;

	int error;
@@ -923,6 +924,8 @@ static int read_rindex_entry(struct gfs2_inode *ip) 
		goto fail;



	rgd->rd_gl->gl_object = rgd;

	rgd->rd_gl->gl_vm.start = rgd->rd_addr * bsize;

	rgd->rd_gl->gl_vm.end = rgd->rd_gl->gl_vm.start + (rgd->rd_length * bsize) - 1;

	rgd->rd_rgl = (struct gfs2_rgrp_lvb *)rgd->rd_gl->gl_lksb.sb_lvbptr;

	rgd->rd_flags &= ~GFS2_RDF_UPTODATE;

	if (rgd->rd_data > sdp->sd_max_rg_data)

CRA Git | Maintained and supported by SUSTech CRA and CCSE