Cluster Project branch, STABLE2, updated. cluster-2.02.00-33-g3ed9000

[fabbione@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=3ed90000f931a576c807d3e8ad7602c359f3dd0e

The branch, STABLE2 has been updated
       via  3ed90000f931a576c807d3e8ad7602c359f3dd0e (commit)
       via  ea6492830de8c15e487b5929ab0c9cf861e48121 (commit)
      from  3db96e8cb13b9fc9f60045832d7de02400e06679 (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 3ed90000f931a576c807d3e8ad7602c359f3dd0e
Author: Bob Peterson <rpeterso@redhat.com>
Date:   Wed Apr 2 16:07:53 2008 -0500

    Resolves: bz 436383: GFS filesystem size inconsistent

commit ea6492830de8c15e487b5929ab0c9cf861e48121
Author: Jonathan Brassow <jbrassow@redhat.com>
Date:   Wed Apr 2 14:38:53 2008 -0500

    rgmanager/lvm.sh: change argument order of shell command
    
    Nice to have output redirect at end of line... cosmetic
    change only.

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

Summary of changes:
 gfs/gfs_grow/main.c                  |    4 +++-
 rgmanager/src/resources/lvm_by_vg.sh |    2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/gfs/gfs_grow/main.c b/gfs/gfs_grow/main.c
index 8d28a4c..3d6da84 100644
--- a/gfs/gfs_grow/main.c
+++ b/gfs/gfs_grow/main.c
@@ -683,11 +683,13 @@ create_rgrps(void)
 	uint64_t space = devsize - fssize;
 	uint64_t optimal_rgrp_size = RGRP_STUFFED_BLKS(&fs_sb) +
 		14 * RGRP_BITMAP_BLKS(&fs_sb) + 15;
-	uint64_t rgrps = 1 + space / optimal_rgrp_size;
+	uint64_t rgrps = space / optimal_rgrp_size;
 	uint64_t offset = fssize;
 	uint64_t rgsize;
 	uint64_t n;
 
+	if (space % optimal_rgrp_size)
+		rgrps++;
 	rgsize = optimal_rgrp_size;
 
 	for (n = 0; n < rgrps; n++)
diff --git a/rgmanager/src/resources/lvm_by_vg.sh b/rgmanager/src/resources/lvm_by_vg.sh
index 8fa36d6..3ee343e 100755
--- a/rgmanager/src/resources/lvm_by_vg.sh
+++ b/rgmanager/src/resources/lvm_by_vg.sh
@@ -203,7 +203,7 @@ function vg_start
 	else
 		# The activation commands succeeded, but did they do anything?
 		# Make sure all the logical volumes are active
-		results=(`lvs -o name,attr --noheadings 2> /dev/null $OCF_RESKEY_vg_name`)
+		results=(`lvs -o name,attr --noheadings $OCF_RESKEY_vg_name 2> /dev/null`)
 		a=0
 		while [ ! -z ${results[$a]} ]; do
 			if [[ ! ${results[$(($a + 1))]} =~ ....a. ]]; then


hooks/post-receive
--
Cluster Project