Attachment 317691 Details for Bug 437803 – A second attempt at fixing this

[patch] A second attempt at fixing this

writepage-2.diff (text/plain), 1.99 KB, created by Steve Whitehouse on 2008-09-25 14:17:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steve Whitehouse

Created: 2008-09-25 14:17:08 UTC

Size: 1.99 KB

patch

obsolete

>diff --git a/fs/gfs2/ops_address.c b/fs/gfs2/ops_address.c
>index 2756381..44a373b 100644
>--- a/fs/gfs2/ops_address.c
>+++ b/fs/gfs2/ops_address.c
>@@ -210,25 +210,23 @@ static int gfs2_jdata_writepage(struct page *page, struct writeback_control *wbc
> {
> 	struct inode *inode = page->mapping->host;
> 	struct gfs2_sbd *sdp = GFS2_SB(inode);
>-	int error;
>+	int ret;
> 	int done_trans = 0;
> 
>-	error = gfs2_writepage_common(page, wbc);
>-	if (error <= 0)
>-		return error;
>-
> 	if (PageChecked(page)) {
> 		if (wbc->sync_mode != WB_SYNC_ALL)
> 			goto out_ignore;
>-		error = gfs2_trans_begin(sdp, RES_DINODE + 1, 0);
>-		if (error)
>+		ret = gfs2_trans_begin(sdp, RES_DINODE + 1, 0);
>+		if (ret)
> 			goto out_ignore;
> 		done_trans = 1;
> 	}
>-	error = __gfs2_jdata_writepage(page, wbc);
>+	ret = gfs2_writepage_common(page, wbc);
>+	if (ret > 0)
>+		ret = __gfs2_jdata_writepage(page, wbc);
> 	if (done_trans)
> 		gfs2_trans_end(sdp);
>-	return error;
>+	return ret;
> 
> out_ignore:
> 	redirty_page_for_writepage(wbc, page);
>diff --git a/fs/gfs2/ops_super.c b/fs/gfs2/ops_super.c
>index d5355d9..c713635 100644
>--- a/fs/gfs2/ops_super.c
>+++ b/fs/gfs2/ops_super.c
>@@ -494,7 +494,7 @@ static void gfs2_delete_inode(struct inode *inode)
> 	gfs2_holder_reinit(LM_ST_EXCLUSIVE, LM_FLAG_TRY_1CB | GL_NOCACHE, &ip->i_iopen_gh);
> 	error = gfs2_glock_nq(&ip->i_iopen_gh);
> 	if (error)
>-		goto out_uninit;
>+		goto out_truncate;
> 
> 	if (S_ISDIR(inode->i_mode) &&
> 	    (ip->i_di.di_flags & GFS2_DIF_EXHASH)) {
>@@ -519,6 +519,7 @@ static void gfs2_delete_inode(struct inode *inode)
> 	if (error)
> 		goto out_unlock;
> 
>+out_truncate:
> 	error = gfs2_trans_begin(sdp, 0, sdp->sd_jdesc->jd_blocks);
> 	if (error)
> 		goto out_unlock;
>@@ -527,8 +528,8 @@ static void gfs2_delete_inode(struct inode *inode)
> 	gfs2_trans_end(sdp);
> 
> out_unlock:
>-	gfs2_glock_dq(&ip->i_iopen_gh);
>-out_uninit:
>+	if (test_bit(HIF_HOLDER, &ip->i_iopen_gh.gh_iflags))
>+		gfs2_glock_dq(&ip->i_iopen_gh);
> 	gfs2_holder_uninit(&ip->i_iopen_gh);
> 	gfs2_glock_dq_uninit(&gh);
> 	if (error && error != GLR_TRYFAILED)

Actions: View | Diff

Attachments on bug 437803: 317086 | 317691 | 319650