Attachment 152913 Details for Bug 236069 – A new patch to fix the bug in prepare_write's locking.

[patch] A new patch to fix the bug in prepare_write's locking.

pw-fix.diff (text/plain), 1.39 KB, created by Steve Whitehouse on 2007-04-18 15:14:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steve Whitehouse

Created: 2007-04-18 15:14:52 UTC

Size: 1.39 KB

patch

obsolete

>diff --git a/fs/gfs2/ops_address.c b/fs/gfs2/ops_address.c
>index 90c2879..2e7517b 100644
>--- a/fs/gfs2/ops_address.c
>+++ b/fs/gfs2/ops_address.c
>@@ -336,6 +336,24 @@ out_unlock:
> 	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
>@@ -360,16 +378,9 @@ static int gfs2_prepare_write(struct file *file, struct page *page,
> 	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_atime(&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);
> 
>@@ -431,7 +442,6 @@ out_alloc_put:
> 		}
> 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