Attachment 152324 Details for Bug 236069 – Patch that was applied to gfs2 when we ran this test.

[patch] Patch that was applied to gfs2 when we ran this test.

ops_address.c.patch (text/plain), 1.90 KB, created by Abhijith Das on 2007-04-11 21:39:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Abhijith Das

Created: 2007-04-11 21:39:06 UTC

Size: 1.90 KB

patch

obsolete

>diff --git a/fs/gfs2/ops_address.c b/fs/gfs2/ops_address.c
>index 90c2879..b4b5435 100644
>--- a/fs/gfs2/ops_address.c
>+++ b/fs/gfs2/ops_address.c
>@@ -242,11 +242,27 @@ static int gfs2_readpage(struct file *fi
> 				/* gfs2_sharewrite_nopage has grabbed the ip->i_gl already */
> 				goto skip_lock;
> 		}
>-		gfs2_holder_init(ip->i_gl, LM_ST_SHARED, GL_ATIME|LM_FLAG_TRY_1CB, &gh);
>-		do_unlock = 1;
>-		error = gfs2_glock_nq_atime(&gh);
>-		if (unlikely(error))
>-			goto out_unlock;
>+		if (!gfs2_glock_is_locked_by_me(ip->i_gl)) {
>+			gfs2_holder_init(ip->i_gl, LM_ST_SHARED, GL_ATIME, &gh);
>+			unlock_page(page);
>+			error = gfs2_glock_nq_atime(&gh);
>+			error = AOP_TRUNCATED_PAGE;
>+			return error;
>+		} else {
>+			struct gfs2_holder *tmp;
>+			spin_lock(&ip->i_gl->gl_spin);
>+			list_for_each_entry(tmp, &ip->i_gl->gl_holders, gh_list) {
>+				if (tmp->gh_owner_pid == current->pid) {
>+					memcpy(&gh, tmp, sizeof(struct gfs2_holder));
>+					break;
>+				}
>+			}
>+			spin_unlock(&ip->i_gl->gl_spin);
>+			do_unlock = 1;
>+		}
>+			
>+/*		if (unlikely(error))
>+  goto out_unlock;*/
> 	}
> 
> skip_lock:
>@@ -359,18 +375,23 @@ static int gfs2_prepare_write(struct fil
> 	struct gfs2_alloc *al;
> 	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 (!gfs2_glock_is_locked_by_me(ip->i_gl)) {
>+		gfs2_holder_init(ip->i_gl, LM_ST_EXCLUSIVE, GL_ATIME, &ip->i_gh);
>+		unlock_page(page);
>+		error = gfs2_glock_nq_atime(&ip->i_gh);
>+	       	error = AOP_TRUNCATED_PAGE;
>+		yield();
>+		return error;
>+	}
>+/*	if (unlikely(error)) {
> 		if (error == GLR_TRYFAILED) {
>-			unlock_page(page);
> 			error = AOP_TRUNCATED_PAGE;
> 			yield();
> 		}
> 		goto out_uninit;
> 	}
> 
>+	lock_page(page);*/
> 	gfs2_write_calc_reserv(ip, write_len, &data_blocks, &ind_blocks);
> 
> 	error = gfs2_write_alloc_required(ip, pos, write_len, &alloc_required);

Actions: View | Diff

Attachments on bug 236069: 152324 | 152913 | 154455