Cluster Project branch, master, updated. cluster-2.99.00-42-gfea6747

Cluster Project branch, master, updated. cluster-2.99.00-42-gfea6747

[teigland]

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=fea674786ea0e4ea900b541c3d5a74b69aa0b5e9

The branch, master has been updated
       via  fea674786ea0e4ea900b541c3d5a74b69aa0b5e9 (commit)
      from  226c395131c88e9ca6e95c9c961d3f2e31e37c2d (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 fea674786ea0e4ea900b541c3d5a74b69aa0b5e9
Author: David Teigland <teigland@redhat.com>
Date:   Tue May 13 14:16:25 2008 -0500

    dlm_controld/gfs_controld: ignore write(2) return value on plock dev
    
    bz 446128
    
    When plocks originate from nfs clients, the kernel mistakenly
    returns 0 instead of the number of bytes written to the plock
    device on write(2).  Don't spam /var/log/messages with errors
    reporting a bad return value from write(2).
    
    Signed-off-by: David Teigland <teigland@redhat.com>

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

Summary of changes:
 group/dlm_controld/plock.c |    6 +-----
 group/gfs_controld/plock.c |    6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/group/dlm_controld/plock.c b/group/dlm_controld/plock.c
index 28818c7..ff27628 100644
--- a/group/dlm_controld/plock.c
+++ b/group/dlm_controld/plock.c
@@ -783,15 +783,11 @@ static int add_waiter(struct lockspace *ls, struct resource *r,
 static void write_result(struct lockspace *ls, struct dlm_plock_info *in,
 			 int rv)
 {
-	int err;
-
 	if (need_fsid_translation)
 		in->fsid = ls->associated_mg_id;
 
 	in->rv = rv;
-	err = write(control_fd, in, sizeof(struct dlm_plock_info));
-	if (err != sizeof(struct dlm_plock_info))
-		log_error("plock result write err %d errno %d", err, errno);
+	write(control_fd, in, sizeof(struct dlm_plock_info));
 }
 
 static void do_waiters(struct lockspace *ls, struct resource *r)
diff --git a/group/gfs_controld/plock.c b/group/gfs_controld/plock.c
index 0876ae5..1b9bbe2 100644
--- a/group/gfs_controld/plock.c
+++ b/group/gfs_controld/plock.c
@@ -798,15 +798,11 @@ static int add_waiter(struct mountgroup *mg, struct resource *r,
 static void write_result(struct mountgroup *mg, struct dlm_plock_info *in,
 			 int rv)
 {
-	int err;
-
 	if (need_fsid_translation)
 		in->fsid = mg->associated_ls_id;
 
 	in->rv = rv;
-	err = write(control_fd, in, sizeof(struct dlm_plock_info));
-	if (err != sizeof(struct dlm_plock_info))
-		log_error("plock result write err %d errno %d", err, errno);
+	write(control_fd, in, sizeof(struct dlm_plock_info));
 }
 
 static void do_waiters(struct mountgroup *mg, struct resource *r)


hooks/post-receive
--
Cluster Project