cluster: STABLE3 - fsck.gfs2: rename gfs2_meta_other to gfs2_meta_rgrp.

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=... Commit: b6cd280f35778a1fa69426df5d5bdbb87e6f0425 Parent: 8e4f539322c240851e5bcf906e54905be9e0a924 Author: Bob Peterson <bob(a)ganesha.peterson&gt; AuthorDate: Mon Jan 25 10:36:51 2010 -0600 Committer: Bob Peterson <rpeterso(a)redhat.com&gt; CommitterDate: Tue Jan 26 14:39:31 2010 -0600 fsck.gfs2: rename gfs2_meta_other to gfs2_meta_rgrp. This patch renames a blockmap block designation from gfs2_meta_other to gfs2_meta_rgrp. This is just a cleanup but makes the code easier to read, since the designation was only used for rgrps. rhbz#455300 --- gfs2/fsck/pass1.c | 9 ++++++++- gfs2/fsck/pass5.c | 2 +- gfs2/libgfs2/libgfs2.h | 6 +++--- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/gfs2/fsck/pass1.c b/gfs2/fsck/pass1.c index b7ee6d5..46aaefa 100644 --- a/gfs2/fsck/pass1.c +++ b/gfs2/fsck/pass1.c @@ -908,11 +908,18 @@ int pass1(struct gfs2_sbd *sbp) rg_count); rgd = osi_list_entry(tmp, struct rgrp_list, list); for (i = 0; i < rgd->ri.ri_length; i++) { + log_debug( _("rgrp block %lld (0x%llx) " + "is now marked as 'rgrp data'\n"), + rgd->ri.ri_addr + i, rgd->ri.ri_addr + i); if(gfs2_blockmap_set(bl, rgd->ri.ri_addr + i, - gfs2_meta_other)){ + gfs2_meta_rgrp)){ stack; return FSCK_ERROR; } + /* rgrps and bitmaps don't have bits to represent + their blocks, so don't do this: + check_n_fix_bitmap(sbp, rgd->ri.ri_addr + i, + gfs2_meta_rgrp);*/ } offset = sizeof(struct gfs2_rgrp); diff --git a/gfs2/fsck/pass5.c b/gfs2/fsck/pass5.c index 07b0559..645d81c 100644 --- a/gfs2/fsck/pass5.c +++ b/gfs2/fsck/pass5.c @@ -37,7 +37,7 @@ static int convert_mark(uint8_t q, uint32_t *count) case gfs2_indir_blk: case gfs2_leaf_blk: - case gfs2_meta_other: + case gfs2_meta_rgrp: case gfs2_meta_eattr: count[2]++; return GFS2_BLKST_USED; diff --git a/gfs2/libgfs2/libgfs2.h b/gfs2/libgfs2/libgfs2.h index 6d1a89f..0e7e1b4 100644 --- a/gfs2/libgfs2/libgfs2.h +++ b/gfs2/libgfs2/libgfs2.h @@ -280,7 +280,7 @@ enum gfs2_mark_block { gfs2_inode_invalid = (0xa), gfs2_meta_inval = (0xb), gfs2_leaf_blk = (0xc), - gfs2_meta_other = (0xd), + gfs2_meta_rgrp = (0xd), gfs2_meta_eattr = (0xe), gfs2_bad_block = (0xf), /* Contains at least one bad block */ @@ -301,10 +301,10 @@ static const inline char *block_type_string(uint8_t q) "fifo", "socket", - "journaled data", + "invalid inode", "invalid meta", "dir leaf", - "other metadata", + "rgrp meta", "eattribute", "bad"};