dlm: master - release 4.0.2
by David Teigland
Gitweb: http://git.fedorahosted.org/git/?p=dlm.git;a=commitdiff;h=ccb5e40a03e1593...
Commit: ccb5e40a03e1593fb505547949f35975d6c679d6
Parent: 2548250de3991f1f0aca297bbd072b525a132841
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Wed Jul 31 10:50:26 2013 -0500
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Wed Jul 31 10:50:26 2013 -0500
release 4.0.2
Signed-off-by: David Teigland <teigland(a)redhat.com>
---
include/version.cf | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/include/version.cf b/include/version.cf
index 7134537..bdef7a7 100644
--- a/include/version.cf
+++ b/include/version.cf
@@ -1,6 +1,6 @@
#ifndef _RELEASE_VERSION_CF_
#define _RELEASE_VERSION_CF_
-#define RELEASE_VERSION "4.0.1"
+#define RELEASE_VERSION "4.0.2"
#endif
10 years, 9 months
fence-agents: master - fence_ilo2: Unable to login when password contains "
by Marek Grác
Gitweb: http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=3a1855...
Commit: 3a185569e825ee8e948a6cbef8bf847f6a7632dc
Parent: 7117a54a55aafb9f6ea97fe7b3a7b56355f609e4
Author: Marek 'marx' Grac <mgrac(a)redhat.com>
AuthorDate: Wed Jul 31 14:15:58 2013 +0200
Committer: Marek 'marx' Grac <mgrac(a)redhat.com>
CommitterDate: Wed Jul 31 14:15:58 2013 +0200
fence_ilo2: Unable to login when password contains "
Resolves: rhbz#990537
---
fence/agents/ilo/fence_ilo.py | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/fence/agents/ilo/fence_ilo.py b/fence/agents/ilo/fence_ilo.py
index 15e273f..ab6e342 100644
--- a/fence/agents/ilo/fence_ilo.py
+++ b/fence/agents/ilo/fence_ilo.py
@@ -12,6 +12,7 @@
#####
import sys, re, pexpect
+from xml.sax.saxutils import quoteattr
sys.path.append("@FENCEAGENTSLIBDIR@")
from fencing import *
@@ -22,8 +23,8 @@ BUILD_DATE="March, 2008"
#END_VERSION_GENERATION
def get_power_status(conn, options):
- conn.send("<LOGIN USER_LOGIN = \"" + options["--username"] + "\"" + \
- " PASSWORD = \"" + options["--password"] + "\">\r\n")
+ conn.send("<LOGIN USER_LOGIN = " + quoteattr(options["--username"]) + \
+ " PASSWORD = " + quoteattr(options["--password"]) + ">\r\n")
conn.send("<SERVER_INFO MODE = \"read\"><GET_HOST_POWER_STATUS/>\r\n")
conn.send("</SERVER_INFO></LOGIN>\r\n")
conn.log_expect(options, "HOST_POWER=\"(.*?)\"", int(options["--power-timeout"]))
@@ -32,8 +33,8 @@ def get_power_status(conn, options):
return status.lower().strip()
def set_power_status(conn, options):
- conn.send("<LOGIN USER_LOGIN = \"" + options["--username"] + "\"" + \
- " PASSWORD = \"" + options["--password"] + "\">\r\n")
+ conn.send("<LOGIN USER_LOGIN = " + quoteattr(options["--username"]) + \
+ " PASSWORD = " + quoteattr(options["--password"]) + ">\r\n")
conn.send("<SERVER_INFO MODE = \"write\">")
if options.has_key("fw_processor") and options["fw_processor"] == "iLO2":
@@ -101,8 +102,8 @@ the iLO card through an XML stream."
else:
conn.send("<RIBCL VERSION=\"1.2\">\r\n")
- conn.send("<LOGIN USER_LOGIN = \"" + options["--username"] + "\"" + \
- " PASSWORD = \"" + options["--password"] + "\">\r\n")
+ conn.send("<LOGIN USER_LOGIN = " + quoteattr(options["--username"]) + \
+ " PASSWORD = " + quoteattr(options["--password"]) + ">\r\n")
if options["--ribcl-version"] >= 2:
conn.send("<RIB_INFO MODE=\"read\"><GET_FW_VERSION />\r\n")
conn.send("</RIB_INFO>\r\n")
10 years, 9 months
fence-agents: v4.0.2 annotated tag has been created
by Marek Grác
Gitweb: http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=0393b1...
Commit: 0393b1b7ef1ac5e17e19fdbc926479064e6dec51
Parent: 0000000000000000000000000000000000000000
Author: Marek 'marx' Grac <mgrac(a)redhat.com>
AuthorDate: 2013-07-30 10:48 +0000
Committer: Marek 'marx' Grac <mgrac(a)redhat.com>
CommitterDate: 2013-07-30 10:48 +0000
annotated tag: v4.0.2 has been created
at 0393b1b7ef1ac5e17e19fdbc926479064e6dec51 (tag)
tagging 7117a54a55aafb9f6ea97fe7b3a7b56355f609e4 (commit)
replaces v4.0.1
v4.0.2 release
Marek 'marx' Grac (4):
fence_ipmilan: New symlink fence_ilo4
fencing: fix attribute --login to --username
fence_ovh: New fence agent for OVH
fence_ipmilan: Better description of lanplus parameter
10 years, 9 months
cluster: RHEL6 - gfs2_edit: print formal inode numbers and hash value on dir display
by Bob Peterson
Gitweb: http://git.fedorahosted.org/git/?p=cluster.git;a=commitdiff;h=20f19daca1f...
Commit: 20f19daca1f21428748249e7982134b7a9728777
Parent: 4920c67a07c7c5c099a94ce49c807c9d23c97b00
Author: Bob Peterson <rpeterso(a)redhat.com>
AuthorDate: Tue Jun 4 11:58:06 2013 -0500
Committer: Bob Peterson <rpeterso(a)redhat.com>
CommitterDate: Wed Jul 24 10:40:45 2013 -0500
gfs2_edit: print formal inode numbers and hash value on dir display
This patch changes the directory display screen of gfs2_edit so that
it prints out the hash value and formal inode number. This makes it
easier to debug directory problems.
---
gfs2/edit/extended.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/gfs2/edit/extended.c b/gfs2/edit/extended.c
index 07c6421..2924292 100644
--- a/gfs2/edit/extended.c
+++ b/gfs2/edit/extended.c
@@ -339,7 +339,7 @@ static int display_leaf(struct iinfo *ind)
break;
total_dirents++;
if (ind->ii[0].dirents >= 1) {
- eol(5);
+ eol(3);
if (termlines) {
if (edit_row[dmode] >=0 &&
line - start_line - 1 ==
@@ -350,9 +350,12 @@ static int display_leaf(struct iinfo *ind)
strcpy(edit_fmt, "%"PRIx64);
}
}
- print_gfs2("%d. (%d). %lld (0x%llx): ",
+ print_gfs2("%d/%d [%08x] %lld/%lld (0x%llx/0x%llx): ",
total_dirents, d + 1,
+ ind->ii[0].dirent[d].dirent.de_hash,
+ ind->ii[0].dirent[d].dirent.de_inum.no_formal_ino,
ind->ii[0].dirent[d].block,
+ ind->ii[0].dirent[d].dirent.de_inum.no_formal_ino,
ind->ii[0].dirent[d].block);
}
print_inode_type(ind->ii[0].dirent[d].dirent.de_type);
10 years, 9 months
cluster: RHEL6 - gfs2_edit: Add new option to print all bitmaps for an rgrp
by Bob Peterson
Gitweb: http://git.fedorahosted.org/git/?p=cluster.git;a=commitdiff;h=4920c67a07c...
Commit: 4920c67a07c7c5c099a94ce49c807c9d23c97b00
Parent: d5dda8f8cda9fb1b32ec17dc1fcd3b196073e8aa
Author: Bob Peterson <rpeterso(a)redhat.com>
AuthorDate: Mon Jan 28 10:31:09 2013 -0700
Committer: Bob Peterson <rpeterso(a)redhat.com>
CommitterDate: Wed Jul 24 10:40:31 2013 -0500
gfs2_edit: Add new option to print all bitmaps for an rgrp
This patch adds a new keyword 'rgbitmaps' that causes gfs2_edit to
print all bitmaps for the given resource group. This is handy for
analysis of file system fragmentation.
---
gfs2/edit/hexedit.c | 31 +++++++++++++++++++++++++++++--
1 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/gfs2/edit/hexedit.c b/gfs2/edit/hexedit.c
index 9b9a599..c3a450b3 100644
--- a/gfs2/edit/hexedit.c
+++ b/gfs2/edit/hexedit.c
@@ -3253,7 +3253,7 @@ static void dump_journal(const char *journal)
/* ------------------------------------------------------------------------ */
static void usage(void)
{
- fprintf(stderr,"\nFormat is: gfs2_edit [-c 1] [-V] [-x] [-h] [identify] [-z <0-9>] [-p structures|blocks][blocktype][blockalloc [val]][blockbits][blockrg][find sb|rg|rb|di|in|lf|jd|lh|ld|ea|ed|lb|13|qc][field <f>[val]] /dev/device\n\n");
+ fprintf(stderr,"\nFormat is: gfs2_edit [-c 1] [-V] [-x] [-h] [identify] [-z <0-9>] [-p structures|blocks][blocktype][blockalloc [val]][blockbits][blockrg][rgcount][rgflags][rgbitmaps][find sb|rg|rb|di|in|lf|jd|lh|ld|ea|ed|lb|13|qc][field <f>[val]] /dev/device\n\n");
fprintf(stderr,"If only the device is specified, it enters into hexedit mode.\n");
fprintf(stderr,"identify - prints out only the block type, not the details.\n");
fprintf(stderr,"printsavedmeta - prints out the saved metadata blocks from a savemeta file.\n");
@@ -3264,6 +3264,8 @@ static void usage(void)
fprintf(stderr,"restoremeta - restore metadata for debugging (DANGEROUS).\n");
fprintf(stderr,"rgcount - print how many RGs in the file system.\n");
fprintf(stderr,"rgflags rgnum [new flags] - print or modify flags for rg #rgnum (0 - X)\n");
+ fprintf(stderr,"rgbitmaps <rgnum> - print out the bitmaps for rgrp "
+ "rgnum.\n");
fprintf(stderr,"-V prints version number.\n");
fprintf(stderr,"-c 1 selects alternate color scheme 1\n");
fprintf(stderr,"-d prints details (for printing journals)\n");
@@ -3540,6 +3542,29 @@ static void process_parameters(int argc, char *argv[], int pass)
gfs2_rgrp_free(&sbd.rgtree);
exit(EXIT_SUCCESS);
}
+ } else if (!strcmp(argv[i], "rgbitmaps")) {
+ int rg, bmap;
+ uint64_t rgblk;
+ struct rgrp_tree *rgd;
+
+ i++;
+ if (i >= argc - 1) {
+ printf("Error: rg # not specified.\n");
+ printf("Format is: %s rgbitmaps rgnum\n",
+ argv[0]);
+ gfs2_rgrp_free(&sbd.rgtree);
+ exit(EXIT_FAILURE);
+ }
+ rg = atoi(argv[i]);
+ rgblk = get_rg_addr(rg);
+ rgd = gfs2_blk2rgrpd(&sbd, rgblk);
+ if (rgd == NULL) {
+ printf("Error: rg # is invalid.\n");
+ gfs2_rgrp_free(&sbd.rgtree);
+ exit(EXIT_FAILURE);
+ }
+ for (bmap = 0; bmap < rgd->ri.ri_length; bmap++)
+ push_block(rgblk + bmap);
}
else if (!strcasecmp(argv[i], "savemeta")) {
getgziplevel(argv, &i);
@@ -3630,7 +3655,8 @@ int main(int argc, char *argv[])
if (termlines)
interactive_mode();
else { /* print all the structures requested */
- for (i = 0; i <= blockhist; i++) {
+ i = 0;
+ while (blockhist > 0) {
block = blockstack[i + 1].block;
if (!block)
break;
@@ -3642,6 +3668,7 @@ int main(int argc, char *argv[])
eol(0);
}
block = pop_block();
+ i++;
}
}
close(fd);
10 years, 9 months
cluster: RHEL6 - gfs2_edit: display pointer offsets for directory dinodes
by Bob Peterson
Gitweb: http://git.fedorahosted.org/git/?p=cluster.git;a=commitdiff;h=d5dda8f8cda...
Commit: d5dda8f8cda9fb1b32ec17dc1fcd3b196073e8aa
Parent: 06e931e14d958ca0b38c202ad09b6e6f4943a5df
Author: Bob Peterson <rpeterso(a)redhat.com>
AuthorDate: Fri Feb 1 14:54:34 2013 -0700
Committer: Bob Peterson <rpeterso(a)redhat.com>
CommitterDate: Wed Jul 24 10:40:15 2013 -0500
gfs2_edit: display pointer offsets for directory dinodes
This patch prints "pointer X" on the hex display for directory
dinodes like it does for indirect blocks.
---
gfs2/edit/hexedit.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/gfs2/edit/hexedit.c b/gfs2/edit/hexedit.c
index cd3ed63..9b9a599 100644
--- a/gfs2/edit/hexedit.c
+++ b/gfs2/edit/hexedit.c
@@ -1416,7 +1416,8 @@ static int hexdump(uint64_t startaddr, int len)
if (cursor_line) {
if (block_type == GFS2_METATYPE_IN ||
((block_type == GFS2_METATYPE_DI) &&
- ((struct gfs2_dinode*)bh->b_data)->di_height)) {
+ ((struct gfs2_dinode*)bh->b_data)->di_height) ||
+ S_ISDIR(di.di_mode)) {
int ptroffset = edit_row[dmode] * 16 +
edit_col[dmode];
10 years, 9 months
cluster: RHEL6 - gfs2_edit: Clean up some magic offsets
by Bob Peterson
Gitweb: http://git.fedorahosted.org/git/?p=cluster.git;a=commitdiff;h=06e931e14d9...
Commit: 06e931e14d958ca0b38c202ad09b6e6f4943a5df
Parent: d019d4a3697fa9d5e055d86e6b40f02a3f22cd60
Author: Andrew Price <anprice(a)redhat.com>
AuthorDate: Fri May 25 10:36:07 2012 +0100
Committer: Bob Peterson <rpeterso(a)redhat.com>
CommitterDate: Wed Jul 24 10:39:04 2013 -0500
gfs2_edit: Clean up some magic offsets
Replace some uses of magic offsets with equivalent struct member
accesses.
rhbz#987508
---
gfs2/edit/hexedit.c | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/gfs2/edit/hexedit.c b/gfs2/edit/hexedit.c
index aec0944..cd3ed63 100644
--- a/gfs2/edit/hexedit.c
+++ b/gfs2/edit/hexedit.c
@@ -1275,6 +1275,7 @@ static int hexdump(uint64_t startaddr, int len)
uint64_t l;
const char *lpBuffer = bh->b_data;
int print_field, cursor_line;
+ const uint32_t block_type = get_block_type(bh);
strcpy(edit_fmt,"%02x");
pointer = (unsigned char *)lpBuffer + offset;
@@ -1372,7 +1373,7 @@ static int hexdump(uint64_t startaddr, int len)
}
print_gfs2("] ");
if (print_field >= 0) {
- switch (get_block_type(bh)) {
+ switch (block_type) {
case GFS2_METATYPE_SB: /* 1 */
print_gfs2(which_fieldname_sb(print_field));
break;
@@ -1413,9 +1414,9 @@ static int hexdump(uint64_t startaddr, int len)
}
}
if (cursor_line) {
- if (((*(bh->b_data + 7) == GFS2_METATYPE_IN) ||
- (*(bh->b_data + 7) == GFS2_METATYPE_DI &&
- (*(bh->b_data + 0x8b) || *(bh->b_data + 0x8a))))) {
+ if (block_type == GFS2_METATYPE_IN ||
+ ((block_type == GFS2_METATYPE_DI) &&
+ ((struct gfs2_dinode*)bh->b_data)->di_height)) {
int ptroffset = edit_row[dmode] * 16 +
edit_col[dmode];
10 years, 9 months
cluster: RHEL6 - gfs2_edit: fix a segfault with file names > 255 bytes
by Bob Peterson
Gitweb: http://git.fedorahosted.org/git/?p=cluster.git;a=commitdiff;h=d019d4a3697...
Commit: d019d4a3697fa9d5e055d86e6b40f02a3f22cd60
Parent: aef6f49250ee8aa3c6792002f8d5bb81091abd76
Author: Bob Peterson <rpeterso(a)redhat.com>
AuthorDate: Fri Feb 1 21:28:46 2013 -0700
Committer: Bob Peterson <rpeterso(a)redhat.com>
CommitterDate: Wed Jul 24 10:29:09 2013 -0500
gfs2_edit: fix a segfault with file names > 255 bytes
This patch fixes a segfault in gfs2_edit caused by trying to print
file names longer than 255 bytes.
---
gfs2/edit/gfs2hex.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/gfs2/edit/gfs2hex.c b/gfs2/edit/gfs2hex.c
index 7962228..0aabcd9 100644
--- a/gfs2/edit/gfs2hex.c
+++ b/gfs2/edit/gfs2hex.c
@@ -122,7 +122,7 @@ void eol(int col) /* end of line */
void __attribute__((format (printf, 1, 2))) print_gfs2(const char *fmt, ...)
{
va_list args;
- char string[NAME_MAX];
+ char string[PATH_MAX];
memset(string, 0, sizeof(string));
va_start(args, fmt);
10 years, 9 months
cluster: RHEL6 - libgfs2: Fix pointer arithmetic in gfs2_quota_change_*
by Bob Peterson
Gitweb: http://git.fedorahosted.org/git/?p=cluster.git;a=commitdiff;h=aef6f49250e...
Commit: aef6f49250ee8aa3c6792002f8d5bb81091abd76
Parent: f0b76db91e8346e9abe3ea6fe4b85ffa03998fe3
Author: Andrew Price <anprice(a)redhat.com>
AuthorDate: Fri Sep 16 15:30:21 2011 +0100
Committer: Bob Peterson <rpeterso(a)redhat.com>
CommitterDate: Wed Jul 24 10:28:56 2013 -0500
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 507cebb..e43cd26 100644
--- a/gfs2/libgfs2/ondisk.c
+++ b/gfs2/libgfs2/ondisk.c
@@ -608,8 +608,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);
@@ -619,8 +619,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);
10 years, 9 months