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

Commit 891003ab authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes 

* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes:
  GFS2: Read resource groups on mount
  GFS2: Ensure rindex is uptodate for fallocate
  GFS2: Read in rindex if necessary during unlink
  GFS2: Fix race between lru_list and glock ref count
parents d5a74afd a365fbf3

fs/gfs2/glock.c

+10 −4
Original line number Diff line number Diff line
@@ -167,14 +167,19 @@ void gfs2_glock_add_to_lru(struct gfs2_glock *gl) 
	spin_unlock(&lru_lock);

}



static void gfs2_glock_remove_from_lru(struct gfs2_glock *gl)

static void __gfs2_glock_remove_from_lru(struct gfs2_glock *gl)

{

	spin_lock(&lru_lock);

	if (!list_empty(&gl->gl_lru)) {

		list_del_init(&gl->gl_lru);

		atomic_dec(&lru_count);

		clear_bit(GLF_LRU, &gl->gl_flags);

	}

}



static void gfs2_glock_remove_from_lru(struct gfs2_glock *gl)

{

	spin_lock(&lru_lock);

	__gfs2_glock_remove_from_lru(gl);

	spin_unlock(&lru_lock);

}
@@ -217,11 +222,12 @@ void gfs2_glock_put(struct gfs2_glock *gl) 
	struct gfs2_sbd *sdp = gl->gl_sbd;

	struct address_space *mapping = gfs2_glock2aspace(gl);



	if (atomic_dec_and_test(&gl->gl_ref)) {

	if (atomic_dec_and_lock(&gl->gl_ref, &lru_lock)) {

		__gfs2_glock_remove_from_lru(gl);

		spin_unlock(&lru_lock);

		spin_lock_bucket(gl->gl_hash);

		hlist_bl_del_rcu(&gl->gl_list);

		spin_unlock_bucket(gl->gl_hash);

		gfs2_glock_remove_from_lru(gl);

		GLOCK_BUG_ON(gl, !list_empty(&gl->gl_holders));

		GLOCK_BUG_ON(gl, mapping && mapping->nrpages);

		trace_gfs2_glock_put(gl);

fs/gfs2/inode.c

+1 −4
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;
@@ -1043,6 +1039,7 @@ static int gfs2_unlink(struct inode *dir, struct dentry *dentry) 
	rgd = gfs2_blk2rgrpd(sdp, ip->i_no_addr);

	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);

	}