Cluster Project branch, RHEL46, updated. cman-kernel_2_6_9_54-12-gd47add8

[cfeist@sourceware.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cluster Project".

http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=d47add8e2cee5bd9fa50584f4d72650aa727d55c

The branch, RHEL46 has been updated
       via  d47add8e2cee5bd9fa50584f4d72650aa727d55c (commit)
      from  02b5f621d1c3d7c06bfafdbd3ad928d8d2728faf (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d47add8e2cee5bd9fa50584f4d72650aa727d55c
Author: Abhijith Das <adas@redhat.com>
Date:   Fri May 9 12:00:05 2008 -0500

    gfs-kernel: Workaround fix for bz 444912 (gfs_glock_is_locked_by_me problem)
    
    This one-line fix, removes the assert warning. The behavior of the code is unchanged except that the assert warnings will no longer appear in the logs. This warning is tripped through the madvise syscall where control reaches the readpage function without the inode glock being held. We return -ENOSYS in such a case, disabling the madvise syscall.
    
    A more elegant fix for RHEL5 gfs that supports the madvise syscall (bz 429343) could not be ported to RHEL4 because AOP_TRUNCATED_PAGE is not available in RHEL4.
    
    4.6.z z-stream bz#446512

-----------------------------------------------------------------------

Summary of changes:
 gfs-kernel/src/gfs/ops_address.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/gfs-kernel/src/gfs/ops_address.c b/gfs-kernel/src/gfs/ops_address.c
index af5b3b3..fb17133 100644
--- a/gfs-kernel/src/gfs/ops_address.c
+++ b/gfs-kernel/src/gfs/ops_address.c
@@ -283,7 +283,7 @@ gfs_readpage(struct file *file, struct page *page)
 
 	atomic_inc(&sdp->sd_ops_address);
 
-	if (gfs_assert_warn(sdp, gfs_glock_is_locked_by_me(ip->i_gl))) {
+	if (!gfs_glock_is_locked_by_me(ip->i_gl)) {
 		unlock_page(page);
 		return -ENOSYS;
 	}


hooks/post-receive
--
Cluster Project