cluster: STABLE31 - dlm_controld: fix man page example formatting
by Fabio M. Di Nitto
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: 599a0db1ba8baa56276adc0fb873a05f0461fe4a
Parent: 888ff2ebc6114b21dcae2e0bae002d613d92e33c
Author: Fabio M. Di Nitto <fdinitto(a)redhat.com>
AuthorDate: Tue Sep 20 06:32:35 2011 +0200
Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com>
CommitterDate: Tue Sep 20 06:32:35 2011 +0200
dlm_controld: fix man page example formatting
Resolves: rhbz#739682
Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com>
---
group/man/dlm_controld.8 | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/group/man/dlm_controld.8 b/group/man/dlm_controld.8
index 7100f0e..6764681 100644
--- a/group/man/dlm_controld.8
+++ b/group/man/dlm_controld.8
@@ -249,7 +249,7 @@ option to 1.
.nf
<dlm>
- <lockspace name="foo" nodir="1">
+ <lockspace name="foo" nodir="1"/>
</dlm>
.fi
12 years, 7 months
fence-agents: RHEL6 - fence_scsi: fix simultaneous unfence operations
by rohara
Gitweb: http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=com...
Commit: e5bf447139c7ba7c128f615a8bcbf46174d0945a
Parent: bc5c5b41acb78a6821bf9f2a80d324f433cec26c
Author: Ryan O'Hara <rohara(a)redhat.com>
AuthorDate: Thu Sep 15 13:23:52 2011 -0500
Committer: Ryan O'Hara <rohara(a)redhat.com>
CommitterDate: Mon Sep 19 12:29:11 2011 -0500
fence_scsi: fix simultaneous unfence operations
This patch fixes an issue where multiple nodes attempt to unfence at
the same time and fail when attempting to create a reservation. Each
node checks to see if a reservation exists, and if not, it will attempt
to create one. The problem occurs when multiple nodes see that no
reservation exists and attempt to create one.
This patch checks the return code of do_reserve. If this call fails,
check again to see if a reservation was created by another node, in
which case there is no error.
Resolves: rhbz#738384
Signed-off-by: Ryan O'Hara <rohara(a)redhat.com>
Reviewed-by: Fabio M. Di Nitto <fdinitto(a)redhat.com>
---
fence/agents/scsi/fence_scsi.pl | 87 ++++++++++++++++++++-------------------
1 files changed, 44 insertions(+), 43 deletions(-)
diff --git a/fence/agents/scsi/fence_scsi.pl b/fence/agents/scsi/fence_scsi.pl
index 2751bed..93f5056 100644
--- a/fence/agents/scsi/fence_scsi.pl
+++ b/fence/agents/scsi/fence_scsi.pl
@@ -48,10 +48,16 @@ sub do_action_on ($@)
log_error ("device $dev does not exist") if (! -e $dev);
log_error ("device $dev is not a block device") if (! -b $dev);
- do_register_ignore ($node_key, $dev);
+ if (do_register_ignore ($node_key, $dev) != 0) {
+ log_error ("failed to create registration (key=$node_key, device=$dev)");
+ }
if (!get_reservation_key ($dev)) {
- do_reserve ($node_key, $dev);
+ if (do_reserve ($node_key, $dev) != 0) {
+ if (!get_reservation_key ($dev)) {
+ log_error ("failed to create reservation (key=$node_key, device=$dev)");
+ }
+ }
}
}
@@ -106,8 +112,7 @@ sub do_action_status ($@)
if ($dev_count != 0) {
exit (0);
- }
- else {
+ } else {
exit (2);
}
}
@@ -199,13 +204,13 @@ sub do_register ($$$)
$out = qx { $cmd 2> /dev/null };
$err = ($?>>8);
- if ($err != 0) {
- log_error ("$self (err=$err)");
- }
+ # if ($err != 0) {
+ # log_error ("$self (err=$err)");
+ # }
- # die "[error]: $self\n" if ($?>>8);
+ log_debug ("$self (err=$err)");
- return;
+ return ($err);
}
sub do_register_ignore ($$)
@@ -236,13 +241,13 @@ sub do_register_ignore ($$)
$out = qx { $cmd 2> /dev/null };
$err = ($?>>8);
- if ($err != 0) {
- log_error ("$self (err=$err)");
- }
+ # if ($err != 0) {
+ # log_error ("$self (err=$err)");
+ # }
- # die "[error]: $self ($dev)\n" if ($?>>8);
+ log_debug ("$self (err=$err)");
- return;
+ return ($err);
}
sub do_reserve ($$)
@@ -256,13 +261,13 @@ sub do_reserve ($$)
my $out = qx { $cmd 2> /dev/null };
my $err = ($?>>8);
- if ($err != 0) {
- log_error ("$self (err=$err)");
- }
+ # if ($err != 0) {
+ # log_error ("$self (err=$err)");
+ # }
- # die "[error]: $self\n" if ($?>>8);
+ log_debug ("$self (err=$err)");
- return;
+ return ($err);
}
sub do_release ($$)
@@ -276,13 +281,13 @@ sub do_release ($$)
my $out = qx { $cmd 2> /dev/null };
my $err = ($?>>8);
- if ($err != 0) {
- log_error ("$self (err=$err)");
- }
+ # if ($err != 0) {
+ # log_error ("$self (err=$err)");
+ # }
- # die "[error]: $self\n" if ($?>>8);
+ log_debug ("$self (err=$err)");
- return;
+ return ($err);
}
sub do_preempt ($$$)
@@ -296,13 +301,13 @@ sub do_preempt ($$$)
my $out = qx { $cmd 2> /dev/null };
my $err = ($?>>8);
- if ($err != 0) {
- log_error ("$self (err=$err)");
- }
+ # if ($err != 0) {
+ # log_error ("$self (err=$err)");
+ # }
- # die "[error]: $self\n" if ($?>>8);
+ log_debug ("$self (err=$err)");
- return;
+ return ($err);
}
sub do_preempt_abort ($$$)
@@ -316,13 +321,13 @@ sub do_preempt_abort ($$$)
my $out = qx { $cmd 2> /dev/null };
my $err = ($?>>8);
- if ($err != 0) {
- log_error ("$self (err=$err)");
- }
+ # if ($err != 0) {
+ # log_error ("$self (err=$err)");
+ # }
- # die "[error]: $self\n" if ($?>>8);
+ log_debug ("$self (err=$err)");
- return;
+ return ($err);
}
sub do_reset (S)
@@ -339,7 +344,7 @@ sub do_reset (S)
log_debug ("$self (dev=$dev, status=$err)");
- return;
+ return ($err);
}
sub dev_unlink ()
@@ -756,8 +761,7 @@ if (@ARGV > 0) {
if ($opt_o =~ /^metadata$/i) {
print_metadata;
}
-}
-else {
+} else {
get_options_stdin ();
}
@@ -780,8 +784,7 @@ if ((!defined $opt_n) && (!defined $opt_k)) {
##
if (defined $opt_k) {
$key = $opt_k;
-}
-else {
+} else {
$key = get_key ($opt_n);
}
@@ -801,8 +804,7 @@ if ($key =~ /^0/) {
##
if (defined $opt_d) {
@devices = split (/\s*,\s*/, $opt_d);
-}
-else {
+} else {
@devices = get_devices_clvm ();
}
@@ -830,8 +832,7 @@ elsif ($opt_o =~ /^off$/i) {
}
elsif ($opt_o =~ /^status/i) {
do_action_status ($key, @devices);
-}
-else {
+} else {
log_error ("unknown action '$opt_o'");
exit (1);
}
12 years, 7 months
fence-agents: RHEL6 - fence_kdump: fix potential null dereference
by rohara
Gitweb: http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=com...
Commit: bc5c5b41acb78a6821bf9f2a80d324f433cec26c
Parent: df491093a86637ae67cacf3dcd4b2b24f1716019
Author: Ryan O'Hara <rohara(a)redhat.com>
AuthorDate: Thu Sep 15 15:05:44 2011 -0500
Committer: Ryan O'Hara <rohara(a)redhat.com>
CommitterDate: Mon Sep 19 12:28:58 2011 -0500
fence_kdump: fix potential null dereference
If strchr returns NULL while parsing options from stdin, continue
without handling the option. This should prevent possible null
dereference.
rhbz#734429
Signed-off-by: Ryan O'Hara <rohara(a)redhat.com>
Reviewed-by: Fabio M. Di Nitto <fdinitto(a)redhat.com>
---
fence/agents/kdump/fence_kdump.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/fence/agents/kdump/fence_kdump.c b/fence/agents/kdump/fence_kdump.c
index 2844a3e..e224db3 100644
--- a/fence/agents/kdump/fence_kdump.c
+++ b/fence/agents/kdump/fence_kdump.c
@@ -427,6 +427,8 @@ get_options_stdin (fence_kdump_opts_t *opts)
if ((arg = strchr (opt, '=')) != 0) {
*arg = 0;
arg += 1;
+ } else {
+ continue;
}
if (!strcasecmp (opt, "nodename")) {
12 years, 7 months
fence-agents: master - fence_scsi: fix simultaneous unfence operations
by rohara
Gitweb: http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=com...
Commit: d532e41a3d2a9d85db4b87b80c36119f59534c85
Parent: 0cef970707cec9ce6cf86a024d69bdb65211aa66
Author: Ryan O'Hara <rohara(a)redhat.com>
AuthorDate: Thu Sep 15 13:23:52 2011 -0500
Committer: Ryan O'Hara <rohara(a)redhat.com>
CommitterDate: Mon Sep 19 12:25:44 2011 -0500
fence_scsi: fix simultaneous unfence operations
This patch fixes an issue where multiple nodes attempt to unfence at
the same time and fail when attempting to create a reservation. Each
node checks to see if a reservation exists, and if not, it will attempt
to create one. The problem occurs when multiple nodes see that no
reservation exists and attempt to create one.
This patch checks the return code of do_reserve. If this call fails,
check again to see if a reservation was created by another node, in
which case there is no error.
Resolves: rhbz#738384
Signed-off-by: Ryan O'Hara <rohara(a)redhat.com>
Reviewed-by: Fabio M. Di Nitto <fdinitto(a)redhat.com>
---
fence/agents/scsi/fence_scsi.pl | 87 ++++++++++++++++++++-------------------
1 files changed, 44 insertions(+), 43 deletions(-)
diff --git a/fence/agents/scsi/fence_scsi.pl b/fence/agents/scsi/fence_scsi.pl
index 2751bed..93f5056 100644
--- a/fence/agents/scsi/fence_scsi.pl
+++ b/fence/agents/scsi/fence_scsi.pl
@@ -48,10 +48,16 @@ sub do_action_on ($@)
log_error ("device $dev does not exist") if (! -e $dev);
log_error ("device $dev is not a block device") if (! -b $dev);
- do_register_ignore ($node_key, $dev);
+ if (do_register_ignore ($node_key, $dev) != 0) {
+ log_error ("failed to create registration (key=$node_key, device=$dev)");
+ }
if (!get_reservation_key ($dev)) {
- do_reserve ($node_key, $dev);
+ if (do_reserve ($node_key, $dev) != 0) {
+ if (!get_reservation_key ($dev)) {
+ log_error ("failed to create reservation (key=$node_key, device=$dev)");
+ }
+ }
}
}
@@ -106,8 +112,7 @@ sub do_action_status ($@)
if ($dev_count != 0) {
exit (0);
- }
- else {
+ } else {
exit (2);
}
}
@@ -199,13 +204,13 @@ sub do_register ($$$)
$out = qx { $cmd 2> /dev/null };
$err = ($?>>8);
- if ($err != 0) {
- log_error ("$self (err=$err)");
- }
+ # if ($err != 0) {
+ # log_error ("$self (err=$err)");
+ # }
- # die "[error]: $self\n" if ($?>>8);
+ log_debug ("$self (err=$err)");
- return;
+ return ($err);
}
sub do_register_ignore ($$)
@@ -236,13 +241,13 @@ sub do_register_ignore ($$)
$out = qx { $cmd 2> /dev/null };
$err = ($?>>8);
- if ($err != 0) {
- log_error ("$self (err=$err)");
- }
+ # if ($err != 0) {
+ # log_error ("$self (err=$err)");
+ # }
- # die "[error]: $self ($dev)\n" if ($?>>8);
+ log_debug ("$self (err=$err)");
- return;
+ return ($err);
}
sub do_reserve ($$)
@@ -256,13 +261,13 @@ sub do_reserve ($$)
my $out = qx { $cmd 2> /dev/null };
my $err = ($?>>8);
- if ($err != 0) {
- log_error ("$self (err=$err)");
- }
+ # if ($err != 0) {
+ # log_error ("$self (err=$err)");
+ # }
- # die "[error]: $self\n" if ($?>>8);
+ log_debug ("$self (err=$err)");
- return;
+ return ($err);
}
sub do_release ($$)
@@ -276,13 +281,13 @@ sub do_release ($$)
my $out = qx { $cmd 2> /dev/null };
my $err = ($?>>8);
- if ($err != 0) {
- log_error ("$self (err=$err)");
- }
+ # if ($err != 0) {
+ # log_error ("$self (err=$err)");
+ # }
- # die "[error]: $self\n" if ($?>>8);
+ log_debug ("$self (err=$err)");
- return;
+ return ($err);
}
sub do_preempt ($$$)
@@ -296,13 +301,13 @@ sub do_preempt ($$$)
my $out = qx { $cmd 2> /dev/null };
my $err = ($?>>8);
- if ($err != 0) {
- log_error ("$self (err=$err)");
- }
+ # if ($err != 0) {
+ # log_error ("$self (err=$err)");
+ # }
- # die "[error]: $self\n" if ($?>>8);
+ log_debug ("$self (err=$err)");
- return;
+ return ($err);
}
sub do_preempt_abort ($$$)
@@ -316,13 +321,13 @@ sub do_preempt_abort ($$$)
my $out = qx { $cmd 2> /dev/null };
my $err = ($?>>8);
- if ($err != 0) {
- log_error ("$self (err=$err)");
- }
+ # if ($err != 0) {
+ # log_error ("$self (err=$err)");
+ # }
- # die "[error]: $self\n" if ($?>>8);
+ log_debug ("$self (err=$err)");
- return;
+ return ($err);
}
sub do_reset (S)
@@ -339,7 +344,7 @@ sub do_reset (S)
log_debug ("$self (dev=$dev, status=$err)");
- return;
+ return ($err);
}
sub dev_unlink ()
@@ -756,8 +761,7 @@ if (@ARGV > 0) {
if ($opt_o =~ /^metadata$/i) {
print_metadata;
}
-}
-else {
+} else {
get_options_stdin ();
}
@@ -780,8 +784,7 @@ if ((!defined $opt_n) && (!defined $opt_k)) {
##
if (defined $opt_k) {
$key = $opt_k;
-}
-else {
+} else {
$key = get_key ($opt_n);
}
@@ -801,8 +804,7 @@ if ($key =~ /^0/) {
##
if (defined $opt_d) {
@devices = split (/\s*,\s*/, $opt_d);
-}
-else {
+} else {
@devices = get_devices_clvm ();
}
@@ -830,8 +832,7 @@ elsif ($opt_o =~ /^off$/i) {
}
elsif ($opt_o =~ /^status/i) {
do_action_status ($key, @devices);
-}
-else {
+} else {
log_error ("unknown action '$opt_o'");
exit (1);
}
12 years, 7 months
fence-agents: master - fence_kdump: fix potential null dereference
by rohara
Gitweb: http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=com...
Commit: 0cef970707cec9ce6cf86a024d69bdb65211aa66
Parent: 61a7bb3addd3862833f5cf23725d378c563a10c5
Author: Ryan O'Hara <rohara(a)redhat.com>
AuthorDate: Thu Sep 15 15:05:44 2011 -0500
Committer: Ryan O'Hara <rohara(a)redhat.com>
CommitterDate: Mon Sep 19 12:22:25 2011 -0500
fence_kdump: fix potential null dereference
If strchr returns NULL while parsing options from stdin, continue
without handling the option. This should prevent possible null
dereference.
rhbz#734429
Signed-off-by: Ryan O'Hara <rohara(a)redhat.com>
Reviewed-by: Fabio M. Di Nitto <fdinitto(a)redhat.com>
---
fence/agents/kdump/fence_kdump.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/fence/agents/kdump/fence_kdump.c b/fence/agents/kdump/fence_kdump.c
index 2844a3e..e224db3 100644
--- a/fence/agents/kdump/fence_kdump.c
+++ b/fence/agents/kdump/fence_kdump.c
@@ -427,6 +427,8 @@ get_options_stdin (fence_kdump_opts_t *opts)
if ((arg = strchr (opt, '=')) != 0) {
*arg = 0;
arg += 1;
+ } else {
+ continue;
}
if (!strcasecmp (opt, "nodename")) {
12 years, 7 months
cluster: RHEL6 - cman: fix copying uidgid trees to corosync
by Fabio M. Di Nitto
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: 3423ebfdd1855cd9dfd760c640416b8e31aaafb7
Parent: c79c32e88eb21219298bde15fb3e537cfb76f002
Author: Fabio M. Di Nitto <fdinitto(a)redhat.com>
AuthorDate: Fri Sep 16 16:13:50 2011 +0200
Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com>
CommitterDate: Mon Sep 19 09:20:38 2011 +0200
cman: fix copying uidgid trees to corosync
Resolves: rhbz#733345
Acked-by: Lon Hohberger <lhh(a)redhat.com>
Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com>
---
cman/daemon/cman-preconfig.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/cman/daemon/cman-preconfig.c b/cman/daemon/cman-preconfig.c
index 7d60226..13949ec 100644
--- a/cman/daemon/cman-preconfig.c
+++ b/cman/daemon/cman-preconfig.c
@@ -1566,7 +1566,7 @@ static int cmanpre_readconfig(struct objdb_iface_ver0 *objdb, const char **error
ret = copy_tree_to_root(objdb, "amf", 0);
ret = copy_tree_to_root(objdb, "aisexec", 0);
ret = copy_tree_to_root(objdb, "service", 1);
- ret = copy_tree_to_root(objdb, "uidgid", 0);
+ ret = copy_tree_to_root(objdb, "uidgid", 1);
}
objdb->object_find_create(cluster_parent_handle, "cman", strlen("cman"), &find_handle);
12 years, 7 months
gfs2-utils: master - libgfs2: Fix pointer arithmetic in gfs2_quota_change_*
by Andrew Price
Gitweb: http://git.fedorahosted.org/git/gfs2-utils.git?p=gfs2-utils.git;a=commitd...
Commit: bda17315a280e3d8e6fc5136c331a55b1d4af43b
Parent: 44fce5b34d7fad6e3a580fd8c917ce5a1d055c5f
Author: Andrew Price <anprice(a)redhat.com>
AuthorDate: Fri Sep 16 15:30:21 2011 +0100
Committer: Andrew Price <anprice(a)redhat.com>
CommitterDate: Fri Sep 16 15:44:45 2011 +0100
libgfs2: Fix pointer arithmetic in gfs2_quota_change_*
Coverity discovered that a casting precedence error in the pointer
arithmetic of gfs2_quota_change_*. This patch fixes the calculations to
ensure the correct pointer types are used.
Signed-off-by: Andrew Price <anprice(a)redhat.com>
---
gfs2/libgfs2/ondisk.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/gfs2/libgfs2/ondisk.c b/gfs2/libgfs2/ondisk.c
index adbf4e9..73b2b0f 100644
--- a/gfs2/libgfs2/ondisk.c
+++ b/gfs2/libgfs2/ondisk.c
@@ -610,8 +610,8 @@ void gfs2_statfs_change_print(struct gfs2_statfs_change *sc)
void gfs2_quota_change_in(struct gfs2_quota_change *qc,
struct gfs2_buffer_head *bh)
{
- struct gfs2_quota_change *str = (struct gfs2_quota_change *)bh->b_data +
- sizeof(struct gfs2_meta_header);
+ struct gfs2_quota_change *str = (struct gfs2_quota_change *)(bh->b_data +
+ sizeof(struct gfs2_meta_header));
CPIN_64(qc, str, qc_change);
CPIN_32(qc, str, qc_flags);
@@ -621,8 +621,8 @@ void gfs2_quota_change_in(struct gfs2_quota_change *qc,
void gfs2_quota_change_out(struct gfs2_quota_change *qc,
struct gfs2_buffer_head *bh)
{
- struct gfs2_quota_change *str = (struct gfs2_quota_change *)bh->b_data +
- sizeof(struct gfs2_meta_header);
+ struct gfs2_quota_change *str = (struct gfs2_quota_change *)(bh->b_data +
+ sizeof(struct gfs2_meta_header));
CPOUT_64(qc, str, qc_change);
CPOUT_32(qc, str, qc_flags);
12 years, 7 months
gfs2-utils: master - gfs_controld: Fix if-statement in shutdown_callback
by Andrew Price
Gitweb: http://git.fedorahosted.org/git/gfs2-utils.git?p=gfs2-utils.git;a=commitd...
Commit: 44fce5b34d7fad6e3a580fd8c917ce5a1d055c5f
Parent: 2e210657077be76fca37f377ef671842d4ebccaa
Author: Andrew Price <anprice(a)redhat.com>
AuthorDate: Thu Sep 15 15:51:47 2011 +0100
Committer: Andrew Price <anprice(a)redhat.com>
CommitterDate: Thu Sep 15 15:57:55 2011 +0100
gfs_controld: Fix if-statement in shutdown_callback
Coverity picked up on an issue in shutdown_callback() where if (flags &
COROSYNC_CFG_SHUTDOWN_FLAG_REQUEST) is always false, so the true-block
is never entered. Since the flags aren't really flags we can fix this by
changing the & to ==
Signed-off-by: Andrew Price <anprice(a)redhat.com>
---
group/gfs_controld/member_cman.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/group/gfs_controld/member_cman.c b/group/gfs_controld/member_cman.c
index 4e482b7..6d0e743 100644
--- a/group/gfs_controld/member_cman.c
+++ b/group/gfs_controld/member_cman.c
@@ -142,7 +142,7 @@ void kick_node_from_cluster(int nodeid)
static void shutdown_callback(corosync_cfg_handle_t h,
corosync_cfg_shutdown_flags_t flags)
{
- if (flags & COROSYNC_CFG_SHUTDOWN_FLAG_REQUEST) {
+ if (flags == COROSYNC_CFG_SHUTDOWN_FLAG_REQUEST) {
if (list_empty(&mountgroups))
corosync_cfg_replyto_shutdown(ch,
COROSYNC_CFG_SHUTDOWN_FLAG_YES);
12 years, 7 months
gfs2-utils: master - gfs2_edit: Fix zeroing the memory for indirect
by Andrew Price
Gitweb: http://git.fedorahosted.org/git/gfs2-utils.git?p=gfs2-utils.git;a=commitd...
Commit: 2e210657077be76fca37f377ef671842d4ebccaa
Parent: 320251b01daf66d9324a32a1db9c00015c67c0e4
Author: Andrew Price <anprice(a)redhat.com>
AuthorDate: Thu Sep 15 11:27:56 2011 +0100
Committer: Andrew Price <anprice(a)redhat.com>
CommitterDate: Thu Sep 15 11:27:56 2011 +0100
gfs2_edit: Fix zeroing the memory for indirect
At two points we currently memset indirect to zero but only with
sizeof(indirect). Since indirect is a pointer this is insufficient. This
patch uses sizeof(struct iinfo) to zero the memory fully.
Signed-off-by: Andrew Price <anprice(a)redhat.com>
---
gfs2/edit/gfs2hex.c | 2 +-
gfs2/edit/hexedit.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/gfs2/edit/gfs2hex.c b/gfs2/edit/gfs2hex.c
index 40959c7..5616122 100644
--- a/gfs2/edit/gfs2hex.c
+++ b/gfs2/edit/gfs2hex.c
@@ -279,7 +279,7 @@ void do_dinode_extended(struct gfs2_dinode *dine, struct gfs2_buffer_head *lbh)
(sbd.gfs1 && dine->__pad1 == GFS_FILE_DIR);
indirect_blocks = 0;
- memset(indirect, 0, sizeof(indirect));
+ memset(indirect, 0, sizeof(struct iinfo));
if (dine->di_height > 0) {
/* Indirect pointers */
for (x = sizeof(struct gfs2_dinode); x < sbd.bsize;
diff --git a/gfs2/edit/hexedit.c b/gfs2/edit/hexedit.c
index 5864e2d..952723f 100644
--- a/gfs2/edit/hexedit.c
+++ b/gfs2/edit/hexedit.c
@@ -1838,7 +1838,7 @@ int display(int identify_only)
lines_per_row[dmode] = 1;
if (gfs2_struct_type == GFS2_METATYPE_SB || blk == 0x10 * (4096 / sbd.bsize)) {
gfs2_sb_in(&sbd.sd_sb, bh); /* parse it out into the sb structure */
- memset(indirect, 0, sizeof(indirect));
+ memset(indirect, 0, sizeof(struct iinfo));
indirect->ii[0].block = sbd.sd_sb.sb_master_dir.no_addr;
indirect->ii[0].is_dir = TRUE;
indirect->ii[0].dirents = 2;
12 years, 7 months
cluster: STABLE31 - cman: fix copying uidgid trees to corosync
by Fabio M. Di Nitto
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: 888ff2ebc6114b21dcae2e0bae002d613d92e33c
Parent: 2ead34f00923c3ff4049e3f6f13c1b8811b38c01
Author: Fabio M. Di Nitto <fdinitto(a)redhat.com>
AuthorDate: Fri Sep 16 16:13:50 2011 +0200
Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com>
CommitterDate: Fri Sep 16 16:13:50 2011 +0200
cman: fix copying uidgid trees to corosync
Resolves: rhbz#733345
Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com>
---
cman/daemon/cman-preconfig.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/cman/daemon/cman-preconfig.c b/cman/daemon/cman-preconfig.c
index d5e7a92..fb534a9 100644
--- a/cman/daemon/cman-preconfig.c
+++ b/cman/daemon/cman-preconfig.c
@@ -1540,7 +1540,7 @@ static int cmanpre_readconfig(struct objdb_iface_ver0 *objdb, const char **error
ret = copy_tree_to_root(objdb, "amf", 0);
ret = copy_tree_to_root(objdb, "aisexec", 0);
ret = copy_tree_to_root(objdb, "service", 1);
- ret = copy_tree_to_root(objdb, "uidgid", 0);
+ ret = copy_tree_to_root(objdb, "uidgid", 1);
}
objdb->object_find_create(cluster_parent_handle, "cman", strlen("cman"), &find_handle);
12 years, 7 months