Attachment 317086 Details for Bug 437803 – Proposed fix

[patch] Proposed fix

writepage.diff (text/plain), 1000 bytes, created by Steve Whitehouse on 2008-09-18 14:33:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steve Whitehouse

Created: 2008-09-18 14:33:14 UTC

Size: 1000 bytes

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

Actions: View | Diff

Attachments on bug 437803: 317086 | 317691 | 319650