Attachment 154455 Details for Bug 236069 – Updated patch to fix this bug

[patch] Updated patch to fix this bug

pw-fix.diff (text/plain), 1.32 KB, created by Steve Whitehouse on 2007-05-10 09:52:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steve Whitehouse

Created: 2007-05-10 09:52:59 UTC

Size: 1.32 KB

patch

obsolete

>--- linux-rhel-base/fs/gfs2/ops_address.c	2007-05-10 10:36:31.000000000 +0100
>+++ linux-2.6.18.noarch/fs/gfs2/ops_address.c	2007-05-10 10:41:39.000000000 +0100
>@@ -324,6 +324,24 @@
> 	goto out;
> }
> 
>+static int gfs2_write_lock_start(struct gfs2_inode *ip, struct page *page)
>+{
>+	struct gfs2_holder *gh = &ip->i_gh;
>+	int ret = 0;
>+	if (!gfs2_glock_is_locked_by_me(ip->i_gl)) {
>+		gfs2_holder_init(ip->i_gl, LM_ST_EXCLUSIVE, GL_ATIME, gh);
>+		unlock_page(page);
>+		ret = gfs2_glock_nq_atime(gh);
>+		if (unlikely(ret)) {
>+			gfs2_holder_uninit(gh);
>+			return ret;
>+		}
>+		ret = AOP_TRUNCATED_PAGE;
>+		yield();
>+	}
>+	return ret;
>+}
>+
> /**
>  * gfs2_prepare_write - Prepare to write a page to a file
>  * @file: The file to write to
>@@ -348,16 +366,9 @@
> 	unsigned int write_len = to - from;
> 
> 
>-	gfs2_holder_init(ip->i_gl, LM_ST_EXCLUSIVE, GL_ATIME|LM_FLAG_TRY_1CB, &ip->i_gh);
>-	error = gfs2_glock_nq_m_atime(1, &ip->i_gh);
>-	if (unlikely(error)) {
>-		if (error == GLR_TRYFAILED) {
>-			unlock_page(page);
>-			error = AOP_TRUNCATED_PAGE;
>-			yield();
>-		}
>-		goto out_uninit;
>-	}
>+	error = gfs2_write_lock_start(ip, page);
>+	if (error)
>+		return error;
> 
> 	gfs2_write_calc_reserv(ip, write_len, &data_blocks, &ind_blocks);
> 
>@@ -419,7 +430,6 @@
> 		}
> out_unlock:
> 		gfs2_glock_dq_m(1, &ip->i_gh);
>-out_uninit:
> 		gfs2_holder_uninit(&ip->i_gh);
> 	}
>

Actions: View | Diff

Attachments on bug 236069: 152324 | 152913 | 154455