Attachment 296569 Details for Bug 432057 – The RHEL version of the patch

[patch] The RHEL version of the patch

rhel-readpage-fix.diff (text/plain), 4.79 KB, created by Steve Whitehouse on 2008-03-03 10:15:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steve Whitehouse

Created: 2008-03-03 10:15:24 UTC

Size: 4.79 KB

patch

obsolete

>diff -Npru linux-rhel-base/fs/gfs2/glock.h linux-2.6.18.noarch/fs/gfs2/glock.h
>--- linux-rhel-base/fs/gfs2/glock.h	2008-03-03 09:10:38.000000000 +0000
>+++ linux-2.6.18.noarch/fs/gfs2/glock.h	2008-03-03 09:59:03.000000000 +0000
>@@ -31,22 +31,21 @@
> #define GLR_TRYFAILED		13
> #define GLR_CANCELED		14
> 
>-static inline int gfs2_glock_is_locked_by_me(struct gfs2_glock *gl)
>+static inline struct gfs2_holder *gfs2_glock_is_locked_by_me(struct gfs2_glock *gl)
> {
> 	struct gfs2_holder *gh;
>-	int locked = 0;
> 
> 	/* Look in glock's list of holders for one with current task as owner */
> 	spin_lock(&gl->gl_spin);
> 	list_for_each_entry(gh, &gl->gl_holders, gh_list) {
>-		if (gh->gh_owner_pid == current->pid) {
>-			locked = 1;
>-			break;
>-		}
>+		if (gh->gh_owner_pid == current->pid)
>+			goto out;
> 	}
>+	gh = NULL;
>+out:
> 	spin_unlock(&gl->gl_spin);
> 
>-	return locked;
>+	return gh;
> }
> 
> static inline int gfs2_glock_is_held_excl(struct gfs2_glock *gl)
>diff -Npru linux-rhel-base/fs/gfs2/inode.c linux-2.6.18.noarch/fs/gfs2/inode.c
>--- linux-rhel-base/fs/gfs2/inode.c	2008-03-03 09:10:48.000000000 +0000
>+++ linux-2.6.18.noarch/fs/gfs2/inode.c	2008-03-03 10:06:20.000000000 +0000
>@@ -491,7 +491,7 @@ struct inode *gfs2_lookupi(struct inode 
> 		return dir;
> 	}
> 
>-	if (gfs2_glock_is_locked_by_me(dip->i_gl) == 0) {
>+	if (gfs2_glock_is_locked_by_me(dip->i_gl) == NULL) {
> 		error = gfs2_glock_nq_init(dip->i_gl, LM_ST_SHARED, 0, &d_gh);
> 		if (error)
> 			return ERR_PTR(error);
>diff -Npru linux-rhel-base/fs/gfs2/ops_address.c linux-2.6.18.noarch/fs/gfs2/ops_address.c
>--- linux-rhel-base/fs/gfs2/ops_address.c	2008-03-03 09:10:48.000000000 +0000
>+++ linux-2.6.18.noarch/fs/gfs2/ops_address.c	2008-03-03 10:06:20.000000000 +0000
>@@ -479,9 +479,8 @@ static int gfs2_readpage(struct file *fi
> 	struct gfs2_inode *ip = GFS2_I(page->mapping->host);
> 	struct gfs2_sbd *sdp = GFS2_SB(page->mapping->host);
> 	struct gfs2_file *gf = NULL;
>-	struct gfs2_holder gh;
>+	struct gfs2_holder *gh = NULL;
> 	int error;
>-	int do_unlock = 0;
> 
> 	if (likely(file != &gfs2_internal_file_sentinel)) {
> 		if (file) {
>@@ -490,11 +489,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);
>-		do_unlock = 1;
>-		error = gfs2_glock_nq_atime(&gh);
>-		if (unlikely(error))
>-			goto out_unlock;
>+		gh = gfs2_glock_is_locked_by_me(ip->i_gl);
>+		if (!gh) {
>+			gh = kmalloc(sizeof(struct gfs2_holder *), GFP_NOFS);
>+			if (!gh)
>+				return -ENOBUFS;
>+			gfs2_holder_init(ip->i_gl, LM_ST_SHARED, GL_ATIME, gh);
>+			unlock_page(page);
>+			error = gfs2_glock_nq_atime(gh);
>+			if (unlikely(error != 0))
>+				goto out;
>+			return AOP_TRUNCATED_PAGE;
>+		}
> 	}
> 
> skip_lock:
>@@ -507,21 +513,13 @@ skip_lock:
> 	if (unlikely(test_bit(SDF_SHUTDOWN, &sdp->sd_flags)))
> 		error = -EIO;
> 
>-	if (do_unlock) {
>-		gfs2_glock_dq_m(1, &gh);
>-		gfs2_holder_uninit(&gh);
>-	}
>+	if (gh) {
>+		gfs2_glock_dq(gh);
> out:
>-	return error;
>-out_unlock:
>-	unlock_page(page);
>-	if (error == GLR_TRYFAILED) {
>-		error = AOP_TRUNCATED_PAGE;
>-		yield();
>+		gfs2_holder_uninit(gh);
>+		kfree(gh);
> 	}
>-	if (do_unlock)
>-		gfs2_holder_uninit(&gh);
>-	goto out;
>+	return error;
> }
> 
> /**
>diff -Npru linux-rhel-base/fs/gfs2/ops_dentry.c linux-2.6.18.noarch/fs/gfs2/ops_dentry.c
>--- linux-rhel-base/fs/gfs2/ops_dentry.c	2008-03-03 09:10:31.000000000 +0000
>+++ linux-2.6.18.noarch/fs/gfs2/ops_dentry.c	2008-03-03 10:06:20.000000000 +0000
>@@ -44,7 +44,7 @@ static int gfs2_drevalidate(struct dentr
> 	struct gfs2_holder d_gh;
> 	struct gfs2_inode *ip = NULL;
> 	int error;
>-	int had_lock=0;
>+	int had_lock = 0;
> 
> 	if (inode) {
> 		if (is_bad_inode(inode))
>@@ -55,7 +55,7 @@ static int gfs2_drevalidate(struct dentr
> 	if (sdp->sd_args.ar_localcaching)
> 		goto valid;
> 
>-	had_lock = gfs2_glock_is_locked_by_me(dip->i_gl);
>+	had_lock = (gfs2_glock_is_locked_by_me(dip->i_gl) != NULL);
> 	if (!had_lock) {
> 		error = gfs2_glock_nq_init(dip->i_gl, LM_ST_SHARED, 0, &d_gh);
> 		if (error)
>diff -Npru linux-rhel-base/fs/gfs2/ops_inode.c linux-2.6.18.noarch/fs/gfs2/ops_inode.c
>--- linux-rhel-base/fs/gfs2/ops_inode.c	2008-03-03 09:10:46.000000000 +0000
>+++ linux-2.6.18.noarch/fs/gfs2/ops_inode.c	2008-03-03 10:06:20.000000000 +0000
>@@ -898,7 +898,7 @@ static int gfs2_permission(struct inode 
> 	int error;
> 	int unlock = 0;
> 
>-	if (gfs2_glock_is_locked_by_me(ip->i_gl) == 0) {
>+	if (gfs2_glock_is_locked_by_me(ip->i_gl) == NULL) {
> 		error = gfs2_glock_nq_init(ip->i_gl, LM_ST_SHARED, LM_FLAG_ANY, &i_gh);
> 		if (error)
> 			return error;
>@@ -1064,7 +1064,7 @@ static int gfs2_getattr(struct vfsmount 
> 	int error;
> 	int unlock = 0;
> 
>-	if (gfs2_glock_is_locked_by_me(ip->i_gl) == 0) {
>+	if (gfs2_glock_is_locked_by_me(ip->i_gl) == NULL) {
> 		error = gfs2_glock_nq_init(ip->i_gl, LM_ST_SHARED, LM_FLAG_ANY, &gh);
> 		if (error)
> 			return error;

Actions: View | Diff

Attachments on bug 432057: 294383 | 295614 | 296569 | 297894 | 298191 | 302891 | 303203 | 303208 | 303209 | 303500 | 303542 | 303631 | 303637 | 303646 | 304026 | 304098 | 304112 | 304161 | 304398 | 304409 | 304572 | 304636 | 304637 | 304749 | 304755 | 304811 | 304837 | 304876 | 304898 | 304946 | 304955 | 304976 | 304984 | 305126 | 305185 | 305237 | 305266 | 305377 | 305387 | 305404 | 305506 | 305513 | 305678 | 305702 | 305727 | 306084 | 306111 | 306191 | 306207 | 306208 | 306275 | 306287 | 306832 | 306972 | 307077 | 307096 | 307158