* [Cluster-devel] cluster/gfs/gfs_fsck rgrp.c
@ 2007-05-04 13:32 rpeterso
0 siblings, 0 replies; 4+ messages in thread
From: rpeterso @ 2007-05-04 13:32 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: cluster
Changes by: rpeterso at sourceware.org 2007-05-04 13:32:55
Modified files:
gfs/gfs_fsck : rgrp.c
Log message:
Resolves: bz 238740: GFS fsck is has problems with resource groups
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_fsck/rgrp.c.diff?cvsroot=cluster&r1=1.6&r2=1.7
--- cluster/gfs/gfs_fsck/rgrp.c 2006/04/20 20:37:50 1.6
+++ cluster/gfs/gfs_fsck/rgrp.c 2007/05/04 13:32:55 1.7
@@ -179,12 +179,29 @@
if (repair_if_corrupted) {
if (query(sdp, "Fix the RG? (y/n)")) {
log_err("Attempting to repair the RG.\n");
- memset(&rgd->rd_rg, 0, sizeof(struct gfs_rgrp));
- rgd->rd_rg.rg_header.mh_magic = GFS_MAGIC;
- rgd->rd_rg.rg_header.mh_type = GFS_METATYPE_RG;
- rgd->rd_rg.rg_header.mh_format = GFS_FORMAT_RG;
- rgd->rd_rg.rg_free = rgd->rd_ri.ri_data;
- gfs_rgrp_out(&rgd->rd_rg, BH_DATA(rgd->rd_bh[x]));
+ if (x) {
+ struct gfs_meta_header mh;
+
+ memset(&mh, 0, sizeof(mh));
+ mh.mh_magic = GFS_MAGIC;
+ mh.mh_type = GFS_METATYPE_RB;
+ mh.mh_format = GFS_FORMAT_RB;
+ gfs_meta_header_out(&mh,
+ BH_DATA(rgd->rd_bh[x]));
+ } else {
+ memset(&rgd->rd_rg, 0,
+ sizeof(struct gfs_rgrp));
+ rgd->rd_rg.rg_header.mh_magic =
+ GFS_MAGIC;
+ rgd->rd_rg.rg_header.mh_type =
+ GFS_METATYPE_RG;
+ rgd->rd_rg.rg_header.mh_format =
+ GFS_FORMAT_RG;
+ rgd->rd_rg.rg_free =
+ rgd->rd_ri.ri_data;
+ gfs_rgrp_out(&rgd->rd_rg,
+ BH_DATA(rgd->rd_bh[x]));
+ }
write_buf(sdp, rgd->rd_bh[x], BW_WAIT);
}
}
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Cluster-devel] cluster/gfs/gfs_fsck rgrp.c
@ 2007-05-04 13:34 rpeterso
0 siblings, 0 replies; 4+ messages in thread
From: rpeterso @ 2007-05-04 13:34 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: cluster
Branch: RHEL5
Changes by: rpeterso at sourceware.org 2007-05-04 13:34:23
Modified files:
gfs/gfs_fsck : rgrp.c
Log message:
Resolves: bz 238740: GFS fsck is has problems with resource groups
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_fsck/rgrp.c.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.6&r2=1.6.2.1
--- cluster/gfs/gfs_fsck/rgrp.c 2006/04/20 20:37:50 1.6
+++ cluster/gfs/gfs_fsck/rgrp.c 2007/05/04 13:34:23 1.6.2.1
@@ -179,12 +179,29 @@
if (repair_if_corrupted) {
if (query(sdp, "Fix the RG? (y/n)")) {
log_err("Attempting to repair the RG.\n");
- memset(&rgd->rd_rg, 0, sizeof(struct gfs_rgrp));
- rgd->rd_rg.rg_header.mh_magic = GFS_MAGIC;
- rgd->rd_rg.rg_header.mh_type = GFS_METATYPE_RG;
- rgd->rd_rg.rg_header.mh_format = GFS_FORMAT_RG;
- rgd->rd_rg.rg_free = rgd->rd_ri.ri_data;
- gfs_rgrp_out(&rgd->rd_rg, BH_DATA(rgd->rd_bh[x]));
+ if (x) {
+ struct gfs_meta_header mh;
+
+ memset(&mh, 0, sizeof(mh));
+ mh.mh_magic = GFS_MAGIC;
+ mh.mh_type = GFS_METATYPE_RB;
+ mh.mh_format = GFS_FORMAT_RB;
+ gfs_meta_header_out(&mh,
+ BH_DATA(rgd->rd_bh[x]));
+ } else {
+ memset(&rgd->rd_rg, 0,
+ sizeof(struct gfs_rgrp));
+ rgd->rd_rg.rg_header.mh_magic =
+ GFS_MAGIC;
+ rgd->rd_rg.rg_header.mh_type =
+ GFS_METATYPE_RG;
+ rgd->rd_rg.rg_header.mh_format =
+ GFS_FORMAT_RG;
+ rgd->rd_rg.rg_free =
+ rgd->rd_ri.ri_data;
+ gfs_rgrp_out(&rgd->rd_rg,
+ BH_DATA(rgd->rd_bh[x]));
+ }
write_buf(sdp, rgd->rd_bh[x], BW_WAIT);
}
}
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Cluster-devel] cluster/gfs/gfs_fsck rgrp.c
@ 2007-05-04 13:43 rpeterso
0 siblings, 0 replies; 4+ messages in thread
From: rpeterso @ 2007-05-04 13:43 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: cluster
Branch: RHEL4
Changes by: rpeterso at sourceware.org 2007-05-04 13:43:30
Modified files:
gfs/gfs_fsck : rgrp.c
Log message:
Resolves: bz 238719: GFS fsck is has problems with resource groups
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_fsck/rgrp.c.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.3.2.5&r2=1.3.2.6
--- cluster/gfs/gfs_fsck/rgrp.c 2006/04/20 20:43:41 1.3.2.5
+++ cluster/gfs/gfs_fsck/rgrp.c 2007/05/04 13:43:30 1.3.2.6
@@ -179,12 +179,27 @@
if (repair_if_corrupted) {
if (query(sdp, "Fix the RG? (y/n)")) {
log_err("Attempting to repair the RG.\n");
- memset(&rgd->rd_rg, 0, sizeof(struct gfs_rgrp));
- rgd->rd_rg.rg_header.mh_magic = GFS_MAGIC;
- rgd->rd_rg.rg_header.mh_type = GFS_METATYPE_RG;
- rgd->rd_rg.rg_header.mh_format = GFS_FORMAT_RG;
- rgd->rd_rg.rg_free = rgd->rd_ri.ri_data;
- gfs_rgrp_out(&rgd->rd_rg, BH_DATA(rgd->rd_bh[x]));
+ if (x) {
+ struct gfs_meta_header mh;
+
+ memset(&mh, 0, sizeof(mh));
+ mh.mh_magic = GFS_MAGIC;
+ mh.mh_type = GFS_METATYPE_RB;
+ mh.mh_format = GFS_FORMAT_RB;
+ gfs_meta_header_out(&mh,
+ BH_DATA(rgd->rd_bh[x]));
+ } else {
+ memset(&rgd->rd_rg, 0,
+ sizeof(struct gfs_rgrp));
+ rgd->rd_rg.rg_header.mh_magic = GFS_MAGIC;
+ rgd->rd_rg.rg_header.mh_type =
+ GFS_METATYPE_RG;
+ rgd->rd_rg.rg_header.mh_format =
+ GFS_FORMAT_RG;
+ rgd->rd_rg.rg_free = rgd->rd_ri.ri_data;
+ gfs_rgrp_out(&rgd->rd_rg,
+ BH_DATA(rgd->rd_bh[x]));
+ }
write_buf(sdp, rgd->rd_bh[x], BW_WAIT);
}
}
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Cluster-devel] cluster/gfs/gfs_fsck rgrp.c
@ 2007-05-04 13:45 rpeterso
0 siblings, 0 replies; 4+ messages in thread
From: rpeterso @ 2007-05-04 13:45 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: cluster
Branch: STABLE
Changes by: rpeterso at sourceware.org 2007-05-04 13:45:17
Modified files:
gfs/gfs_fsck : rgrp.c
Log message:
Resolves: bz 238719: GFS fsck is has problems with resource groups
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_fsck/rgrp.c.diff?cvsroot=cluster&only_with_tag=STABLE&r1=1.3.2.2.4.1.2.2&r2=1.3.2.2.4.1.2.3
--- cluster/gfs/gfs_fsck/rgrp.c 2006/04/20 20:57:26 1.3.2.2.4.1.2.2
+++ cluster/gfs/gfs_fsck/rgrp.c 2007/05/04 13:45:17 1.3.2.2.4.1.2.3
@@ -179,12 +179,27 @@
if (repair_if_corrupted) {
if (query(sdp, "Fix the RG? (y/n)")) {
log_err("Attempting to repair the RG.\n");
- memset(&rgd->rd_rg, 0, sizeof(struct gfs_rgrp));
- rgd->rd_rg.rg_header.mh_magic = GFS_MAGIC;
- rgd->rd_rg.rg_header.mh_type = GFS_METATYPE_RG;
- rgd->rd_rg.rg_header.mh_format = GFS_FORMAT_RG;
- rgd->rd_rg.rg_free = rgd->rd_ri.ri_data;
- gfs_rgrp_out(&rgd->rd_rg, BH_DATA(rgd->rd_bh[x]));
+ if (x) {
+ struct gfs_meta_header mh;
+
+ memset(&mh, 0, sizeof(mh));
+ mh.mh_magic = GFS_MAGIC;
+ mh.mh_type = GFS_METATYPE_RB;
+ mh.mh_format = GFS_FORMAT_RB;
+ gfs_meta_header_out(&mh,
+ BH_DATA(rgd->rd_bh[x]));
+ } else {
+ memset(&rgd->rd_rg, 0,
+ sizeof(struct gfs_rgrp));
+ rgd->rd_rg.rg_header.mh_magic = GFS_MAGIC;
+ rgd->rd_rg.rg_header.mh_type =
+ GFS_METATYPE_RG;
+ rgd->rd_rg.rg_header.mh_format =
+ GFS_FORMAT_RG;
+ rgd->rd_rg.rg_free = rgd->rd_ri.ri_data;
+ gfs_rgrp_out(&rgd->rd_rg,
+ BH_DATA(rgd->rd_bh[x]));
+ }
write_buf(sdp, rgd->rd_bh[x], BW_WAIT);
}
}
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2007-05-04 13:45 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-05-04 13:43 [Cluster-devel] cluster/gfs/gfs_fsck rgrp.c rpeterso
-- strict thread matches above, loose matches on Subject: below --
2007-05-04 13:45 rpeterso
2007-05-04 13:34 rpeterso
2007-05-04 13:32 rpeterso
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).