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

GFS2: Read resource groups on mount 



This makes mount take slightly longer, but at the same time, the first
write to the filesystem will be faster too. It also means that if there
is a problem in the resource index, then we can refuse to mount rather
than having to try and report that when the first write occurs.

In addition, to avoid recursive locking, we hvae to take account of
instances when the rindex glock may already be held when we are
trying to update the rbtree of resource groups.

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

fs/gfs2/file.c

+0 −5
Original line number Diff line number Diff line
@@ -772,11 +772,6 @@ static long gfs2_fallocate(struct file *file, int mode, loff_t offset, 
	if (bytes == 0)

		bytes = sdp->sd_sb.sb_bsize;



	error = gfs2_rindex_update(sdp);

	if (error) {

		fs_warn(sdp, "rindex update returns %d\n", error);

		return error;

	}

	gfs2_holder_init(ip->i_gl, LM_ST_EXCLUSIVE, 0, &ip->i_gh);

	error = gfs2_glock_nq(&ip->i_gh);

	if (unlikely(error))

fs/gfs2/inode.c

+3 −11
Original line number Diff line number Diff line
@@ -391,10 +391,6 @@ static int alloc_dinode(struct gfs2_inode *dip, u64 *no_addr, u64 *generation) 
	int error;

	int dblocks = 1;



	error = gfs2_rindex_update(sdp);

	if (error)

		fs_warn(sdp, "rindex update returns %d\n", error);



	error = gfs2_inplace_reserve(dip, RES_DINODE);

	if (error)

		goto out;
@@ -1035,19 +1031,15 @@ static int gfs2_unlink(struct inode *dir, struct dentry *dentry) 
	struct buffer_head *bh;

	struct gfs2_holder ghs[3];

	struct gfs2_rgrpd *rgd;

	int error;

	int error = -EROFS;



	error = gfs2_rindex_update(sdp);

	if (error)

		return error;

	gfs2_holder_init(dip->i_gl, LM_ST_EXCLUSIVE, 0, ghs);

	gfs2_holder_init(ip->i_gl,  LM_ST_EXCLUSIVE, 0, ghs + 1);



	rgd = gfs2_blk2rgrpd(sdp, ip->i_no_addr);

	if (!rgd) {

		error = -EROFS;

	if (!rgd)

		goto out_inodes;

	}



	gfs2_holder_init(rgd->rd_gl, LM_ST_EXCLUSIVE, 0, ghs + 2);

fs/gfs2/ops_fstype.c

+5 −0
Original line number Diff line number Diff line
@@ -800,6 +800,11 @@ static int init_inodes(struct gfs2_sbd *sdp, int undo) 
		fs_err(sdp, "can't get quota file inode: %d\n", error);

		goto fail_rindex;

	}



	error = gfs2_rindex_update(sdp);

	if (error)

		goto fail_qinode;



	return 0;



fail_qinode:

fs/gfs2/rgrp.c

+9 −4
Original line number Diff line number Diff line
@@ -683,15 +683,20 @@ int gfs2_rindex_update(struct gfs2_sbd *sdp) 
	struct gfs2_glock *gl = ip->i_gl;

	struct gfs2_holder ri_gh;

	int error = 0;

	int unlock_required = 0;



	/* Read new copy from disk if we don't have the latest */

	if (!sdp->sd_rindex_uptodate) {

		mutex_lock(&sdp->sd_rindex_mutex);

		if (!gfs2_glock_is_locked_by_me(gl)) {

			error = gfs2_glock_nq_init(gl, LM_ST_SHARED, 0, &ri_gh);

			if (error)

				return error;

			unlock_required = 1;

		}

		if (!sdp->sd_rindex_uptodate)

			error = gfs2_ri_update(ip);

		if (unlock_required)

			gfs2_glock_dq_uninit(&ri_gh);

		mutex_unlock(&sdp->sd_rindex_mutex);

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE