Attachment 306817 Details for Bug 447920 – Bob's 27May2008 patch

[patch] Bob's 27May2008 patch

447920.27may2008.patch (text/plain), 1.33 KB, created by Robert Peterson on 2008-05-27 18:27:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Robert Peterson

Created: 2008-05-27 18:27:25 UTC

Size: 1.33 KB

patch

obsolete

>diff -pur a/fs/gfs2/ops_address.c b/fs/gfs2/ops_address.c
>--- a/fs/gfs2/ops_address.c	2008-04-18 15:11:57.000000000 -0500
>+++ b/fs/gfs2/ops_address.c	2008-05-27 12:40:49.000000000 -0500
>@@ -481,6 +481,9 @@ static int gfs2_readpage(struct file *fi
> 	struct gfs2_holder gh;
> 	int error;
> 	int do_unlock = 0;
>+	struct address_space *mapping = page->mapping;
>+	pgoff_t index = page->index;
>+	struct page *pg;
> 
> 	if (likely(file != &gfs2_internal_file_sentinel)) {
> 		if (file) {
>@@ -489,11 +492,18 @@ 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);
>+		unlock_page(page);
>+		gfs2_holder_init(ip->i_gl, LM_ST_SHARED, GL_ATIME, &gh);
> 		do_unlock = 1;
> 		error = gfs2_glock_nq_atime(&gh);
> 		if (unlikely(error))
>-			goto out_unlock;
>+			return error;
>+		pg = find_trylock_page(mapping, index);
>+		if (pg == NULL) {
>+			gfs2_glock_dq_uninit(&gh);
>+			yield();
>+			return AOP_TRUNCATED_PAGE;
>+		}
> 	}
> 
> skip_lock:
>@@ -510,17 +520,7 @@ skip_lock:
> 		gfs2_glock_dq_m(1, &gh);
> 		gfs2_holder_uninit(&gh);
> 	}
>-out:
> 	return error;
>-out_unlock:
>-	unlock_page(page);
>-	if (error == GLR_TRYFAILED) {
>-		error = AOP_TRUNCATED_PAGE;
>-		yield();
>-	}
>-	if (do_unlock)
>-		gfs2_holder_uninit(&gh);
>-	goto out;
> }
> 
> /**

Actions: View | Diff

Attachments on bug 447920: 306378 | 306379 | 306427 | 306428 | 306497 | 306817 | 306906 | 307044