summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBob Peterson <rpeterso@redhat.com>2011-08-08 20:16:01 (GMT)
committerBob Peterson <rpeterso@redhat.com>2012-01-20 14:26:26 (GMT)
commit2dd1ef3d036b0958fcf3dee56945e5454fd7bdb0 (patch)
tree2be3383ce77910676044c0b669aca632baec0634
parentf5da0eb475b287a1bc4227b54c87083878490c72 (diff)
downloadcluster-2dd1ef3d036b0958fcf3dee56945e5454fd7bdb0.zip
cluster-2dd1ef3d036b0958fcf3dee56945e5454fd7bdb0.tar.gz
cluster-2dd1ef3d036b0958fcf3dee56945e5454fd7bdb0.tar.xz
fsck.gfs2: fsck.gfs2: Ask to reclaim unlinked meta per-rgrp only
Before this patch, fsck.gfs2 would ask for every unlinked metadata bit whether you wanted to reclaim it as free space. This patch makes it ask only once per resource group, and reports which resource group so that the user doesn't think it's stuck in an infinite loop. rhbz#675723
-rw-r--r--gfs2/fsck/initialize.c16
1 files changed, 12 insertions, 4 deletions
diff --git a/gfs2/fsck/initialize.c b/gfs2/fsck/initialize.c
index 29e4560..08da24f 100644
--- a/gfs2/fsck/initialize.c
+++ b/gfs2/fsck/initialize.c
@@ -192,7 +192,7 @@ static void check_rgrp_integrity(struct gfs2_sbd *sdp, struct rgrp_list *rgd,
int *this_rg_bad)
{
uint32_t rg_free, rg_reclaimed;
- int rgb, x, y, off, bytes_to_check, total_bytes_to_check;
+ int rgb, x, y, off, bytes_to_check, total_bytes_to_check, asked = 0;
unsigned int state;
rg_free = rg_reclaimed = 0;
@@ -231,9 +231,17 @@ static void check_rgrp_integrity(struct gfs2_sbd *sdp, struct rgrp_list *rgd,
}
/* GFS2_BLKST_UNLINKED */
*this_rg_bad = 1;
- if (!(*fixit)) {
- if (query(_("Okay to reclaim unlinked "
- "inodes? (y/n)")))
+ if (!asked) {
+ char msg[256];
+
+ asked = 1;
+ sprintf(msg,
+ _("Okay to reclaim unlinked "
+ "inodes in resource group "
+ "%lld (0x%llx)? (y/n)"),
+ (unsigned long long)rgd->ri.ri_addr,
+ (unsigned long long)rgd->ri.ri_addr);
+ if (query("%s", msg))
*fixit = 1;
}
if (!(*fixit))