Commit 87d21e07 authored by S. Wendy Cheng's avatar S. Wendy Cheng Committed by Steven Whitehouse
Browse files

[GFS2] Fix gfs2_rename deadlock 



Second round of gfs2_rename lock re-ordering to allow Anaconda adding
root partition on top of gfs2. Previous to this patch the recursive
lock detector in glock.c can be triggered due to attempting to lock
the rgrp twice. This fixes it by checking to see whether the rgrp
is already locked.

This fixes Red Hat bugzilla #221237

Signed-off-by: default avatarS. Wendy Cheng <wcheng@redhat.com>
Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent 6c93fd1e

fs/gfs2/inode.c

+31 −19
Original line number Diff line number Diff line
@@ -281,13 +281,13 @@ out: 
}



/**

 * gfs2_change_nlink_i - Change nlink count on inode

 * gfs2_change_nlink - Change nlink count on inode

 * @ip: The GFS2 inode

 * @diff: The change in the nlink count required

 *

 * Returns: errno

 */

int gfs2_change_nlink_i(struct gfs2_inode *ip, int diff)

int gfs2_change_nlink(struct gfs2_inode *ip, int diff)

{

	struct buffer_head *dibh;

	u32 nlink;
@@ -320,40 +320,52 @@ int gfs2_change_nlink_i(struct gfs2_inode *ip, int diff) 
	brelse(dibh);

	mark_inode_dirty(&ip->i_inode);



	if (ip->i_inode.i_nlink == 0)

		error = gfs2_change_nlink_i(ip);



	return error;

}



int gfs2_change_nlink(struct gfs2_inode *ip, int diff)

int gfs2_change_nlink_i(struct gfs2_inode *ip)

{

	struct gfs2_sbd *sdp = ip->i_inode.i_sb->s_fs_info;

	int error;



	/* update the nlink */

	error = gfs2_change_nlink_i(ip, diff);

	if (error)

		return error;



	/* return meta data block back to rg */

	if (ip->i_inode.i_nlink == 0) {

	struct gfs2_inode *rindex = GFS2_I(sdp->sd_rindex);

	struct gfs2_glock *ri_gl = rindex->i_gl;

	struct gfs2_rgrpd *rgd;

	struct gfs2_holder ri_gh, rg_gh;

	int existing, error;



	/* if we come from rename path, we could have the lock already */

	existing = gfs2_glock_is_locked_by_me(ri_gl);

	if (!existing) {

		error = gfs2_rindex_hold(sdp, &ri_gh);

		if (error)

			goto out;

	}



	/* find the matching rgd */

	error = -EIO;

	rgd = gfs2_blk2rgrpd(sdp, ip->i_num.no_addr);

	if (!rgd)

		goto out_norgrp;



	/*

	 * Eventually we may want to move rgd(s) to a linked list

	 * and piggyback the free logic into one of gfs2 daemons

	 * to gain some performance.

	 */

	if (!rgd->rd_gl || !gfs2_glock_is_locked_by_me(rgd->rd_gl)) {

		error = gfs2_glock_nq_init(rgd->rd_gl, LM_ST_EXCLUSIVE, 0, &rg_gh);

		if (error)

			goto out_norgrp;



		gfs2_unlink_di(&ip->i_inode); /* mark inode unlinked */

		gfs2_glock_dq_uninit(&rg_gh);

	}



out_norgrp:

	if (!existing)

		gfs2_glock_dq_uninit(&ri_gh);

	}

out:

	return error;

}

fs/gfs2/inode.h

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ int gfs2_inode_refresh(struct gfs2_inode *ip); 


int gfs2_dinode_dealloc(struct gfs2_inode *inode);

int gfs2_change_nlink(struct gfs2_inode *ip, int diff);

int gfs2_change_nlink_i(struct gfs2_inode *ip, int diff);

int gfs2_change_nlink_i(struct gfs2_inode *ip);

struct inode *gfs2_lookupi(struct inode *dir, const struct qstr *name,

			   int is_root, struct nameidata *nd);

struct inode *gfs2_createi(struct gfs2_holder *ghs, const struct qstr *name,

fs/gfs2/ops_inode.c

+3 −22
Original line number Diff line number Diff line
@@ -553,7 +553,6 @@ static int gfs2_rename(struct inode *odir, struct dentry *odentry, 
	int alloc_required;

	unsigned int x;

	int error;

	struct gfs2_rgrpd *rgd;



	if (ndentry->d_inode) {

		nip = GFS2_I(ndentry->d_inode);
@@ -685,12 +684,12 @@ static int gfs2_rename(struct inode *odir, struct dentry *odentry, 
		error = gfs2_trans_begin(sdp, sdp->sd_max_dirres +

					 al->al_rgd->rd_ri.ri_length +

					 4 * RES_DINODE + 4 * RES_LEAF +

					 RES_STATFS + RES_QUOTA + 1, 0);

					 RES_STATFS + RES_QUOTA + 4, 0);

		if (error)

			goto out_ipreserv;

	} else {

		error = gfs2_trans_begin(sdp, 4 * RES_DINODE +

					 5 * RES_LEAF + 1, 0);

					 5 * RES_LEAF + 4, 0);

		if (error)

			goto out_gunlock;

	}
@@ -704,25 +703,7 @@ static int gfs2_rename(struct inode *odir, struct dentry *odentry, 
			error = gfs2_dir_del(ndip, &ndentry->d_name);

			if (error)

				goto out_end_trans;

			error = gfs2_change_nlink_i(nip, -1);

			if ((!error) && (nip->i_inode.i_nlink == 0)) {

				error = -EIO;

				rgd = gfs2_blk2rgrpd(sdp, nip->i_num.no_addr);

				if (rgd) {

					struct gfs2_holder nlink_rg_gh;

					if (rgd != nip->i_alloc.al_rgd)

						error = gfs2_glock_nq_init(

						rgd->rd_gl, LM_ST_EXCLUSIVE,

						0, &nlink_rg_gh);

					else

						error = 0;

                			if (!error) {

						gfs2_unlink_di(&nip->i_inode);

						if (rgd != nip->i_alloc.al_rgd)

							gfs2_glock_dq_uninit(&nlink_rg_gh);

					}

				}

			}

			error = gfs2_change_nlink(nip, -1);

		}

		if (error)

			goto out_end_trans;

CRA Git | Maintained and supported by SUSTech CRA and CCSE