Attachment 144885 Details for Bug 221237 – patch to address this issue

[patch] patch to address this issue

gfs2_meta_reclaim.patch (text/plain), 3.23 KB, created by Wendy Cheng on 2007-01-05 04:45:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Wendy Cheng

Created: 2007-01-05 04:45:39 UTC

Size: 3.23 KB

patch

obsolete

>--- linux-2.6.18/fs/gfs2/inode.h	2006-11-27 15:34:45.000000000 -0500
>+++ linux/fs/gfs2/inode.h	2007-01-04 14:57:26.000000000 -0500
>@@ -34,6 +34,7 @@ int gfs2_inode_refresh(struct gfs2_inode
> 
> 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);
> 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,
>--- linux-2.6.18/fs/gfs2/ops_inode.c	2006-11-27 15:34:45.000000000 -0500
>+++ linux/fs/gfs2/ops_inode.c	2007-01-04 16:03:17.000000000 -0500
>@@ -716,12 +716,12 @@ static int gfs2_rename(struct inode *odi
> 		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, 0);
>+					 RES_STATFS + RES_QUOTA + 4, 0);
> 		if (error)
> 			goto out_ipreserv;
> 	} else {
> 		error = gfs2_trans_begin(sdp, 4 * RES_DINODE +
>-					 5 * RES_LEAF, 0);
>+					 5 * RES_LEAF + 4, 0);
> 		if (error)
> 			goto out_gunlock;
> 	}
>--- linux-2.6.18/fs/gfs2/inode.c	2006-11-27 15:34:45.000000000 -0500
>+++ linux/fs/gfs2/inode.c	2007-01-04 23:37:27.000000000 -0500
>@@ -306,10 +306,8 @@ out:
>  *
>  * Returns: errno
>  */
>-
> int gfs2_change_nlink(struct gfs2_inode *ip, int diff)
> {
>-	struct gfs2_sbd *sdp = ip->i_inode.i_sb->s_fs_info;
> 	struct buffer_head *dibh;
> 	u32 nlink;
> 	int error;
>@@ -338,26 +336,52 @@ int gfs2_change_nlink(struct gfs2_inode 
> 	brelse(dibh);
> 	mark_inode_dirty(&ip->i_inode);
> 
>-	if (ip->i_di.di_nlink == 0) {
>-		struct gfs2_rgrpd *rgd;
>-		struct gfs2_holder ri_gh, rg_gh;
>+	if (ip->i_di.di_nlink == 0) 
>+		error = gfs2_change_nlink_i(ip);
>+
>+	return error;
>+}
> 
>+int gfs2_change_nlink_i(struct gfs2_inode *ip)
>+{
>+	struct gfs2_sbd *sdp = ip->i_inode.i_sb->s_fs_info;
>+        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;
>-		error = -EIO;
>-		rgd = gfs2_blk2rgrpd(sdp, ip->i_num.no_addr);
>-		if (!rgd)
>-			goto out_norgrp;
>+	}
>+
>+	/* 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;
> }
>@@ -369,7 +393,6 @@ struct inode *gfs2_lookup_simple(struct 
> 	return gfs2_lookupi(dip, &qstr, 1, NULL);
> }
> 
>-
> /**
>  * gfs2_lookupi - Look up a filename in a directory and return its inode
>  * @d_gh: An initialized holder for the directory glock

Actions: View | Diff

Attachments on bug 221237: 144885