Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=7fd... Commit: 7fd936c0f96689f53c58341bf5ea20a37a119911 Parent: 25541883d8844c4cfcac59346a211c897a84bbb6 Author: Bob Peterson bob@ganesha.peterson AuthorDate: Thu Jan 21 17:07:41 2010 -0600 Committer: Bob Peterson rpeterso@redhat.com CommitterDate: Tue Jan 26 14:39:29 2010 -0600
libgfs2: Remove unneeded sdp parameter in gfs2_block_set
Function gfs2_blockmap_set does not use the sdp parameter, so it only was wasting time passing it. Therefore I removed it. Again, this may not seem like much, but it's called for every allocated block, which numbers in the millions.
rhbz#455300 --- gfs2/edit/savemeta.c | 2 +- gfs2/fsck/eattr.c | 2 +- gfs2/fsck/lost_n_found.c | 4 +- gfs2/fsck/main.c | 10 +++---- gfs2/fsck/metawalk.c | 8 +++--- gfs2/fsck/pass1.c | 59 ++++++++++++++++++++++----------------------- gfs2/fsck/pass1b.c | 22 +++++++---------- gfs2/fsck/pass2.c | 12 ++++---- gfs2/fsck/pass3.c | 8 +++--- gfs2/fsck/pass4.c | 12 ++++---- gfs2/libgfs2/block_list.c | 4 +- gfs2/libgfs2/libgfs2.h | 4 +- 12 files changed, 70 insertions(+), 77 deletions(-)
diff --git a/gfs2/edit/savemeta.c b/gfs2/edit/savemeta.c index a69816f..3e7ec7e 100644 --- a/gfs2/edit/savemeta.c +++ b/gfs2/edit/savemeta.c @@ -642,7 +642,7 @@ void savemeta(char *out_fn, int saveoption) (unsigned long long)rgd->ri.ri_addr, rgd->ri.ri_length); for (i = 0; i < rgd->ri.ri_length; i++) { - if(gfs2_blockmap_set(&sbd, blocklist, + if(gfs2_blockmap_set(blocklist, rgd->ri.ri_addr + i, gfs2_meta_other)) break; diff --git a/gfs2/fsck/eattr.c b/gfs2/fsck/eattr.c index 6be4fa3..199bc46 100644 --- a/gfs2/fsck/eattr.c +++ b/gfs2/fsck/eattr.c @@ -15,7 +15,7 @@ static int clear_blk_nodup(struct gfs2_sbd *sbp, uint64_t block) return 1; }
- gfs2_blockmap_set(sbp, bl, block, gfs2_block_free); + gfs2_blockmap_set(bl, block, gfs2_block_free);
return 0;
diff --git a/gfs2/fsck/lost_n_found.c b/gfs2/fsck/lost_n_found.c index 25dec6c..2c8bbea 100644 --- a/gfs2/fsck/lost_n_found.c +++ b/gfs2/fsck/lost_n_found.c @@ -44,8 +44,8 @@ int add_inode_to_lf(struct gfs2_inode *ip){ * directory or just found an old one, and we * used that instead of the block_type to run * this */ - gfs2_blockmap_set(ip->i_sbd, bl, - lf_dip->i_di.di_num.no_addr, gfs2_inode_dir); + gfs2_blockmap_set(bl, lf_dip->i_di.di_num.no_addr, + gfs2_inode_dir); increment_link(ip->i_sbd, ip->i_sbd->md.rooti->i_di.di_num.no_addr); increment_link(ip->i_sbd, lf_dip->i_di.di_num.no_addr); diff --git a/gfs2/fsck/main.c b/gfs2/fsck/main.c index ffac5e7..25c36ad 100644 --- a/gfs2/fsck/main.c +++ b/gfs2/fsck/main.c @@ -169,9 +169,8 @@ static int check_system_inode(struct gfs2_inode *sysinode, const char *filename, /* Just reuse the inode and fix the bitmap. */ if (ds.q == gfs2_block_free) { log_info( _("The inode exists but the block is not marked 'in use'; fixing it.\n")); - gfs2_blockmap_set(sysinode->i_sbd, bl, - sysinode->i_di.di_num.no_addr, - mark); + gfs2_blockmap_set(bl,sysinode->i_di.di_num.no_addr, + mark); ds.q = mark; if (mark == gfs2_inode_dir) dirtree_insert(sysinode->i_di.di_num.no_addr); @@ -187,9 +186,8 @@ static int check_system_inode(struct gfs2_inode *sysinode, const char *filename, log_err( _("Invalid or missing %s system inode.\n"), filename); if (query(_("Create new %s system inode? (y/n) "), filename)) { builder(sysinode->i_sbd); - gfs2_blockmap_set(sysinode->i_sbd, bl, - sysinode->i_di.di_num.no_addr, - mark); + gfs2_blockmap_set(bl, sysinode->i_di.di_num.no_addr, + mark); ds.q = mark; if (mark == gfs2_inode_dir) dirtree_insert(sysinode->i_di.di_num.no_addr); diff --git a/gfs2/fsck/metawalk.c b/gfs2/fsck/metawalk.c index d5a29b7..fa332de 100644 --- a/gfs2/fsck/metawalk.c +++ b/gfs2/fsck/metawalk.c @@ -615,7 +615,7 @@ static int check_eattr_entries(struct gfs2_inode *ip, /* Endianness doesn't matter in this case because it's a single byte. */ - gfs2_blockmap_set(sdp, bl, + gfs2_blockmap_set(bl, ip->i_di.di_eattr, gfs2_meta_eattr); log_err( _("The EA was " @@ -769,8 +769,8 @@ static int check_indirect_eattr(struct gfs2_inode *ip, uint64_t indirect, if (indirect_buf->b_modified) gfs2_set_bitmap(sdp, indirect, GFS2_BLKST_FREE); - gfs2_blockmap_set(sdp, bl, indirect, - gfs2_block_free); + gfs2_blockmap_set(bl, indirect, + gfs2_block_free); error = 1; } } @@ -1128,7 +1128,7 @@ int delete_blocks(struct gfs2_inode *ip, uint64_t block, (unsigned long long)block, (unsigned long long)ip->i_di.di_num.no_addr, (unsigned long long)ip->i_di.di_num.no_addr); - gfs2_blockmap_set(ip->i_sbd, bl, block, gfs2_block_free); + gfs2_blockmap_set(bl, block, gfs2_block_free); gfs2_free_block(ip->i_sbd, block); } } diff --git a/gfs2/fsck/pass1.c b/gfs2/fsck/pass1.c index ba5206d..7563d60 100644 --- a/gfs2/fsck/pass1.c +++ b/gfs2/fsck/pass1.c @@ -79,7 +79,7 @@ static int leaf(struct gfs2_inode *ip, uint64_t block, (unsigned long long)ip->i_di.di_num.no_addr, (unsigned long long)ip->i_di.di_num.no_addr, (unsigned long long)block, (unsigned long long)block); - gfs2_blockmap_set(ip->i_sbd, bl, block, gfs2_leaf_blk); + gfs2_blockmap_set(bl, block, gfs2_leaf_blk); bc->indir_count++; return 0; } @@ -95,7 +95,7 @@ static int check_metalist(struct gfs2_inode *ip, uint64_t block, *bh = NULL;
if (gfs2_check_range(ip->i_sbd, block)){ /* blk outside of FS */ - gfs2_blockmap_set(ip->i_sbd, bl, ip->i_di.di_num.no_addr, + gfs2_blockmap_set(bl, ip->i_di.di_num.no_addr, gfs2_bad_block); log_debug( _("Bad indirect block pointer (out of range).\n"));
@@ -114,7 +114,7 @@ static int check_metalist(struct gfs2_inode *ip, uint64_t block, log_debug( _("Bad indirect block pointer (points to " "something that is not an indirect block).\n")); if(!found_dup) { - gfs2_blockmap_set(ip->i_sbd, bl, block, gfs2_meta_inval); + gfs2_blockmap_set(bl, block, gfs2_meta_inval); brelse(nbh); return 1; } @@ -125,7 +125,7 @@ static int check_metalist(struct gfs2_inode *ip, uint64_t block, if (!found_dup) { log_debug( _("Setting %" PRIu64 " (0x%" PRIx64 ") to indirect " "block.\n"), block, block); - gfs2_blockmap_set(ip->i_sbd, bl, block, gfs2_indir_blk); + gfs2_blockmap_set(bl, block, gfs2_indir_blk); } bc->indir_count++;
@@ -147,7 +147,7 @@ static int check_data(struct gfs2_inode *ip, uint64_t block, void *private) /* Mark the owner of this block with the bad_block * designator so we know to check it for out of range * blocks later */ - gfs2_blockmap_set(ip->i_sbd, bl, ip->i_di.di_num.no_addr, + gfs2_blockmap_set(bl, ip->i_di.di_num.no_addr, gfs2_bad_block); return 1; } @@ -178,7 +178,7 @@ static int check_data(struct gfs2_inode *ip, uint64_t block, void *private) } log_debug( _("Marking block %llu (0x%llx) as data block\n"), (unsigned long long)block, (unsigned long long)block); - gfs2_blockmap_set(ip->i_sbd, bl, block, gfs2_block_used); + gfs2_blockmap_set(bl, block, gfs2_block_used);
/* This is also confusing, so I'll clarify. There are two bitmaps: (1) The gfs2_bmap that fsck uses to keep track of what block @@ -221,8 +221,7 @@ static int remove_inode_eattr(struct gfs2_inode *ip, struct block_count *bc, if (!duplicate) { gfs2_set_bitmap(ip->i_sbd, ip->i_di.di_eattr, GFS2_BLKST_FREE); - gfs2_blockmap_set(ip->i_sbd, bl, ip->i_di.di_eattr, - gfs2_block_free); + gfs2_blockmap_set(bl, ip->i_di.di_eattr, gfs2_block_free); } ip->i_di.di_eattr = 0; bc->ea_count = 0; @@ -276,7 +275,7 @@ static int clear_eas(struct gfs2_inode *ip, struct block_count *bc, log_err( _("The bad extended attribute was " "removed.\n")); } else if (!duplicate) { - gfs2_blockmap_set(sdp, bl, block, gfs2_block_free); + gfs2_blockmap_set(bl, block, gfs2_block_free); gfs2_set_bitmap(sdp, block, GFS2_BLKST_FREE); log_err( _("The bad Extended Attribute was " "removed.\n")); @@ -303,7 +302,7 @@ static int check_eattr_indir(struct gfs2_inode *ip, uint64_t indirect, if(gfs2_check_range(sdp, indirect)) { /*log_warn("EA indirect block #%"PRIu64" is out of range.\n", indirect); - gfs2_blockmap_set(sdp, bl, parent, bad_block);*/ + gfs2_blockmap_set(bl, parent, bad_block);*/ /* Doesn't help to mark this here - this gets checked * in pass1c */ return 1; @@ -345,7 +344,7 @@ static int check_eattr_indir(struct gfs2_inode *ip, uint64_t indirect, log_debug( _("Setting #%" PRIu64 " (0x%" PRIx64 ") to indirect Extended Attribute block\n"), indirect, indirect); - gfs2_blockmap_set(sdp, bl, indirect, gfs2_indir_blk); + gfs2_blockmap_set(bl, indirect, gfs2_indir_blk); bc->ea_count++; } return ret; @@ -432,7 +431,7 @@ static int check_leaf_block(struct gfs2_inode *ip, uint64_t block, int btype, /* Point of confusion: We've got to set the ea block itself to gfs2_meta_eattr here. Elsewhere we mark the inode with gfs2_eattr_block meaning it contains an eattr for pass1c. */ - gfs2_blockmap_set(sdp, bl, block, gfs2_meta_eattr); + gfs2_blockmap_set(bl, block, gfs2_meta_eattr); bc->ea_count++; *bh = leaf_bh; return 0; @@ -470,7 +469,7 @@ static int check_extended_leaf_eattr(struct gfs2_inode *ip, uint64_t *data_ptr, (unsigned long long)ip->i_di.di_eattr, (unsigned long long)el_blk, (unsigned long long)el_blk); - gfs2_blockmap_set(sdp, bl, ip->i_di.di_eattr, gfs2_bad_block); + gfs2_blockmap_set(bl, ip->i_di.di_eattr, gfs2_bad_block); return 1; } error = check_leaf_block(ip, el_blk, GFS2_METATYPE_ED, &bh, private); @@ -501,7 +500,7 @@ static int check_eattr_leaf(struct gfs2_inode *ip, uint64_t block, (unsigned long long)ip->i_di.di_num.no_addr, (unsigned long long)ip->i_di.di_num.no_addr, (unsigned long long)block, (unsigned long long)block); - gfs2_blockmap_set(sdp, bl, ip->i_di.di_eattr, gfs2_bad_block); + gfs2_blockmap_set(bl, ip->i_di.di_eattr, gfs2_bad_block); return 1; } return check_leaf_block(ip, block, GFS2_METATYPE_EA, bh, private); @@ -554,7 +553,7 @@ static int clear_metalist(struct gfs2_inode *ip, uint64_t block, *bh = NULL;
if(!is_duplicate(block)) { - gfs2_blockmap_set(ip->i_sbd, bl, block, gfs2_block_free); + gfs2_blockmap_set(bl, block, gfs2_block_free); return 0; } return 0; @@ -563,7 +562,7 @@ static int clear_metalist(struct gfs2_inode *ip, uint64_t block, static int clear_data(struct gfs2_inode *ip, uint64_t block, void *private) { if(!is_duplicate(block)) { - gfs2_blockmap_set(ip->i_sbd, bl, block, gfs2_block_free); + gfs2_blockmap_set(bl, block, gfs2_block_free); return 0; } return 0; @@ -579,7 +578,7 @@ static int clear_leaf(struct gfs2_inode *ip, uint64_t block, if(!is_duplicate(block)) { log_crit( _("Setting leaf #%" PRIu64 " (0x%" PRIx64 ") invalid\n"), block, block); - if(gfs2_blockmap_set(ip->i_sbd, bl, block, gfs2_block_free)) { + if(gfs2_blockmap_set(bl, block, gfs2_block_free)) { stack; return -1; } @@ -633,7 +632,7 @@ static int handle_di(struct gfs2_sbd *sdp, struct gfs2_buffer_head *bh, case S_IFDIR: log_debug( _("Setting %" PRIu64 " (0x%" PRIx64 ") to directory inode.\n"), block, block); - if(gfs2_blockmap_set(sdp, bl, block, gfs2_inode_dir)) { + if(gfs2_blockmap_set(bl, block, gfs2_inode_dir)) { stack; fsck_inode_put(&ip); return -1; @@ -647,7 +646,7 @@ static int handle_di(struct gfs2_sbd *sdp, struct gfs2_buffer_head *bh, case S_IFREG: log_debug( _("Setting %" PRIu64 " (0x%" PRIx64 ") to file inode.\n"), block, block); - if(gfs2_blockmap_set(sdp, bl, block, gfs2_inode_file)) { + if(gfs2_blockmap_set(bl, block, gfs2_inode_file)) { stack; fsck_inode_put(&ip); return -1; @@ -656,7 +655,7 @@ static int handle_di(struct gfs2_sbd *sdp, struct gfs2_buffer_head *bh, case S_IFLNK: log_debug( _("Setting %" PRIu64 " (0x%" PRIx64 ") to symlink inode.\n"), block, block); - if(gfs2_blockmap_set(sdp, bl, block, gfs2_inode_lnk)) { + if(gfs2_blockmap_set(bl, block, gfs2_inode_lnk)) { stack; fsck_inode_put(&ip); return -1; @@ -665,7 +664,7 @@ static int handle_di(struct gfs2_sbd *sdp, struct gfs2_buffer_head *bh, case S_IFBLK: log_debug( _("Setting %" PRIu64 " (0x%" PRIx64 ") to block dev inode.\n"), block, block); - if(gfs2_blockmap_set(sdp, bl, block, gfs2_inode_blk)) { + if(gfs2_blockmap_set(bl, block, gfs2_inode_blk)) { stack; fsck_inode_put(&ip); return -1; @@ -674,7 +673,7 @@ static int handle_di(struct gfs2_sbd *sdp, struct gfs2_buffer_head *bh, case S_IFCHR: log_debug( _("Setting %" PRIu64 " (0x%" PRIx64 ") to char dev inode.\n"), block, block); - if(gfs2_blockmap_set(sdp, bl, block, gfs2_inode_chr)) { + if(gfs2_blockmap_set(bl, block, gfs2_inode_chr)) { stack; fsck_inode_put(&ip); return -1; @@ -683,7 +682,7 @@ static int handle_di(struct gfs2_sbd *sdp, struct gfs2_buffer_head *bh, case S_IFIFO: log_debug( _("Setting %" PRIu64 " (0x%" PRIx64 ") to fifo inode.\n"), block, block); - if(gfs2_blockmap_set(sdp, bl, block, gfs2_inode_fifo)) { + if(gfs2_blockmap_set(bl, block, gfs2_inode_fifo)) { stack; fsck_inode_put(&ip); return -1; @@ -692,7 +691,7 @@ static int handle_di(struct gfs2_sbd *sdp, struct gfs2_buffer_head *bh, case S_IFSOCK: log_debug( _("Setting %" PRIu64 " (0x%" PRIx64 ") to socket inode.\n"), block, block); - if(gfs2_blockmap_set(sdp, bl, block, gfs2_inode_sock)) { + if(gfs2_blockmap_set(bl, block, gfs2_inode_sock)) { stack; fsck_inode_put(&ip); return -1; @@ -701,7 +700,7 @@ static int handle_di(struct gfs2_sbd *sdp, struct gfs2_buffer_head *bh, default: log_debug( _("Setting %" PRIu64 " (0x%" PRIx64 ") to invalid.\n"), block, block); - if(gfs2_blockmap_set(sdp, bl, block, gfs2_meta_inval)) { + if(gfs2_blockmap_set(bl, block, gfs2_meta_inval)) { stack; fsck_inode_put(&ip); return -1; @@ -727,7 +726,7 @@ static int handle_di(struct gfs2_sbd *sdp, struct gfs2_buffer_head *bh, (1 >> (ip->i_di.di_size/sizeof(uint64_t)))); /* once implemented, remove continue statement */ log_warn( _("Marking inode invalid\n")); - if(gfs2_blockmap_set(sdp, bl, block, gfs2_meta_inval)) { + if(gfs2_blockmap_set(bl, block, gfs2_meta_inval)) { stack; fsck_inode_put(&ip); return -1; @@ -751,8 +750,8 @@ static int handle_di(struct gfs2_sbd *sdp, struct gfs2_buffer_head *bh, (unsigned long long)ip->i_di.di_num.no_addr); /* FIXME: Must set all leaves invalid as well */ check_metatree(ip, &invalidate_metatree); - gfs2_blockmap_set(sdp, bl, ip->i_di.di_num.no_addr, - gfs2_meta_inval); + gfs2_blockmap_set(bl, ip->i_di.di_num.no_addr, + gfs2_meta_inval); gfs2_set_bitmap(sdp, ip->i_di.di_num.no_addr, GFS2_BLKST_FREE); fsck_inode_put(&ip); return 0; @@ -843,8 +842,8 @@ 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++) { - if(gfs2_blockmap_set(sbp, bl, rgd->ri.ri_addr + i, - gfs2_meta_other)){ + if(gfs2_blockmap_set(bl, rgd->ri.ri_addr + i, + gfs2_meta_other)){ stack; return FSCK_ERROR; } diff --git a/gfs2/fsck/pass1b.c b/gfs2/fsck/pass1b.c index 1ee0ebd..728ec8b 100644 --- a/gfs2/fsck/pass1b.c +++ b/gfs2/fsck/pass1b.c @@ -165,8 +165,8 @@ static int clear_dup_metalist(struct gfs2_inode *ip, uint64_t block, dh->id->parent); /* Setting the block to invalid means the inode is * cleared in pass2 */ - gfs2_blockmap_set(ip->i_sbd, bl, ip->i_di.di_num.no_addr, - gfs2_meta_inval); + gfs2_blockmap_set(bl, ip->i_di.di_num.no_addr, + gfs2_meta_inval); } return 0; } @@ -197,8 +197,7 @@ static int clear_dup_eattr_indir(struct gfs2_inode *ip, uint64_t block, log_err( _("Inode %s is in directory %" PRIu64 " (0x%" PRIx64 ")\n"), dh->id->name ? dh->id->name : "", dh->id->parent, dh->id->parent); - gfs2_blockmap_set(ip->i_sbd, bl, ip->i_di.di_eattr, - gfs2_meta_inval); + gfs2_blockmap_set(bl, ip->i_di.di_eattr, gfs2_meta_inval); }
return 0; @@ -224,8 +223,7 @@ static int clear_dup_eattr_leaf(struct gfs2_inode *ip, uint64_t block, dh->id->name ? dh->id->name : "", dh->id->parent, dh->id->parent); /* mark the main eattr block invalid */ - gfs2_blockmap_set(ip->i_sbd, bl, ip->i_di.di_eattr, - gfs2_meta_inval); + gfs2_blockmap_set(bl, ip->i_di.di_eattr, gfs2_meta_inval); }
return 0; @@ -295,8 +293,7 @@ static int clear_eattr_extentry(struct gfs2_inode *ip, uint64_t *ea_data_ptr, dh->id->name ? dh->id->name : "", dh->id->parent, dh->id->parent); /* mark the main eattr block invalid */ - gfs2_blockmap_set(ip->i_sbd, bl, ip->i_di.di_eattr, - gfs2_meta_inval); + gfs2_blockmap_set(bl, ip->i_di.di_eattr, gfs2_meta_inval); }
return 0; @@ -418,9 +415,8 @@ static int handle_dup_blk(struct gfs2_sbd *sbp, struct duptree *b) inodetree_delete(ii); /* Setting the block to invalid means the inode is cleared in pass2 */ - gfs2_blockmap_set(ip->i_sbd, bl, - ip->i_di.di_num.no_addr, - gfs2_meta_inval); + gfs2_blockmap_set(bl, ip->i_di.di_num.no_addr, + gfs2_meta_inval); bmodified(ip->i_bh); fsck_inode_put(&ip); } else { @@ -465,8 +461,8 @@ static int handle_dup_blk(struct gfs2_sbd *sbp, struct duptree *b) if(!id->ea_only) check_metatree(ip, &clear_dup_fxns);
- gfs2_blockmap_set(ip->i_sbd, bl, ip->i_di.di_num.no_addr, - gfs2_meta_inval); + gfs2_blockmap_set(bl, ip->i_di.di_num.no_addr, + gfs2_meta_inval); fsck_inode_put(&ip); /* out, brelse, free */ dh.ref_inode_count--; if(dh.ref_inode_count == 1) diff --git a/gfs2/fsck/pass2.c b/gfs2/fsck/pass2.c index a368124..3052190 100644 --- a/gfs2/fsck/pass2.c +++ b/gfs2/fsck/pass2.c @@ -186,8 +186,8 @@ static int check_dentry(struct gfs2_inode *ip, struct gfs2_dirent *dent, "\tName length = %u\n"), de->de_rec_len, de->de_name_len); - gfs2_blockmap_set(sbp, bl, ip->i_di.di_num.no_addr, - gfs2_meta_inval); + gfs2_blockmap_set(bl, ip->i_di.di_num.no_addr, + gfs2_meta_inval); return 1; /* FIXME: should probably delete the entry here at the * very least - maybe look at attempting to fix it */ @@ -255,7 +255,7 @@ static int check_dentry(struct gfs2_inode *ip, struct gfs2_dirent *dent, bmodified(entry_ip->i_bh); fsck_inode_put(&entry_ip); dirent2_del(ip, bh, prev_de, dent); - gfs2_blockmap_set(sbp, bl, entryblock, gfs2_block_free); + gfs2_blockmap_set(bl, entryblock, gfs2_block_free); bmodified(bh); log_warn( _("The inode containing bad blocks was " "deleted.\n")); @@ -306,7 +306,7 @@ static int check_dentry(struct gfs2_inode *ip, struct gfs2_dirent *dent, check_metatree(entry_ip, &pass2_fxns_delete); bmodified(entry_ip->i_bh); fsck_inode_put(&entry_ip); - gfs2_blockmap_set(sbp, bl, entryblock, gfs2_block_free); + gfs2_blockmap_set(bl, entryblock, gfs2_block_free);
return 1; } else { @@ -575,7 +575,7 @@ static int check_system_dir(struct gfs2_inode *sysinode, const char *dirname, return -1; } if (error > 0) - gfs2_blockmap_set(sysinode->i_sbd, bl, iblock, gfs2_meta_inval); + gfs2_blockmap_set(bl, iblock, gfs2_meta_inval);
if(check_inode_eattr(sysinode, &pass2_fxns)) { stack; @@ -753,7 +753,7 @@ int pass2(struct gfs2_sbd *sbp) } else log_err( _("Directory entry to invalid inode remains.\n")); } - gfs2_blockmap_set(sbp, bl, dirblk, gfs2_meta_inval); + gfs2_blockmap_set(bl, dirblk, gfs2_meta_inval); } ip = fsck_load_inode(sbp, dirblk); if(!ds.dotdir) { diff --git a/gfs2/fsck/pass3.c b/gfs2/fsck/pass3.c index fd34de2..5f529f2 100644 --- a/gfs2/fsck/pass3.c +++ b/gfs2/fsck/pass3.c @@ -201,7 +201,7 @@ int pass3(struct gfs2_sbd *sbp) log_err( _("Found unlinked directory containing bad block\n")); if(query( _("Clear unlinked directory with bad blocks? (y/n) "))) { - gfs2_blockmap_set(sbp, bl, + gfs2_blockmap_set(bl, di->dinode, gfs2_block_free); break; @@ -216,8 +216,8 @@ int pass3(struct gfs2_sbd *sbp) q != gfs2_inode_fifo && q != gfs2_inode_sock) { log_err( _("Unlinked block marked as inode not an inode\n")); - gfs2_blockmap_set(sbp, bl, di->dinode, - gfs2_block_free); + gfs2_blockmap_set(bl, di->dinode, + gfs2_block_free); log_err( _("Cleared\n")); break; } @@ -230,7 +230,7 @@ int pass3(struct gfs2_sbd *sbp) if(!ip->i_di.di_size && !ip->i_di.di_eattr){ log_err( _("Unlinked directory has zero size.\n")); if(query( _("Remove zero-size unlinked directory? (y/n) "))) { - gfs2_blockmap_set(sbp, bl, + gfs2_blockmap_set(bl, di->dinode, gfs2_block_free); fsck_inode_put(&ip); diff --git a/gfs2/fsck/pass4.c b/gfs2/fsck/pass4.c index efcf70d..d275ecf 100644 --- a/gfs2/fsck/pass4.c +++ b/gfs2/fsck/pass4.c @@ -72,8 +72,8 @@ static int scan_inode_list(struct gfs2_sbd *sbp) { check_metatree(ip, &pass4_fxns_delete); bmodified(ip->i_bh); fsck_inode_put(&ip); - gfs2_blockmap_set(sbp, bl, ii->inode, - gfs2_block_free); + gfs2_blockmap_set(bl, ii->inode, + gfs2_block_free); continue; } else log_err( _("Unlinked inode with bad blocks not cleared\n")); @@ -96,8 +96,8 @@ static int scan_inode_list(struct gfs2_sbd *sbp) { &pass4_fxns_delete); check_metatree(ip, &pass4_fxns_delete); bmodified(ip->i_bh); - gfs2_blockmap_set(sbp, bl, ii->inode, - gfs2_block_free); + gfs2_blockmap_set(bl, ii->inode, + gfs2_block_free); log_err( _("The inode was deleted\n")); } else { log_err( _("The inode was not " @@ -114,8 +114,8 @@ static int scan_inode_list(struct gfs2_sbd *sbp) { if(!ip->i_di.di_size && !ip->i_di.di_eattr){ log_err( _("Unlinked inode has zero size\n")); if(query( _("Clear zero-size unlinked inode? (y/n) "))) { - gfs2_blockmap_set(sbp, bl, ii->inode, - gfs2_block_free); + gfs2_blockmap_set(bl, ii->inode, + gfs2_block_free); fsck_inode_put(&ip); continue; } diff --git a/gfs2/libgfs2/block_list.c b/gfs2/libgfs2/block_list.c index b671a4b..2c1bfc9 100644 --- a/gfs2/libgfs2/block_list.c +++ b/gfs2/libgfs2/block_list.c @@ -125,8 +125,8 @@ int gfs2_block_unmark(struct gfs2_sbd *sdp, struct gfs2_bmap *bmap, return 0; }
-int gfs2_blockmap_set(struct gfs2_sbd *sdp, struct gfs2_bmap *bmap, - uint64_t bblock, enum gfs2_mark_block mark) +int gfs2_blockmap_set(struct gfs2_bmap *bmap, uint64_t bblock, + enum gfs2_mark_block mark) { static unsigned char *byte; static uint64_t b; diff --git a/gfs2/libgfs2/libgfs2.h b/gfs2/libgfs2/libgfs2.h index 0452e47..4fbc4e1 100644 --- a/gfs2/libgfs2/libgfs2.h +++ b/gfs2/libgfs2/libgfs2.h @@ -306,8 +306,8 @@ extern struct special_blocks *blockfind(struct special_blocks *blist, uint64_t n extern void gfs2_special_add(struct special_blocks *blocklist, uint64_t block); extern void gfs2_special_set(struct special_blocks *blocklist, uint64_t block); extern void gfs2_special_free(struct special_blocks *blist); -extern int gfs2_blockmap_set(struct gfs2_sbd *sdp, struct gfs2_bmap *il, - uint64_t block, enum gfs2_mark_block mark); +extern int gfs2_blockmap_set(struct gfs2_bmap *il, uint64_t block, + enum gfs2_mark_block mark); extern void gfs2_special_clear(struct special_blocks *blocklist, uint64_t block); /* gfs2_block_unmark clears ONE mark for the given block */
cluster-commits@lists.stg.fedorahosted.org