Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=... Commit: 8e4f539322c240851e5bcf906e54905be9e0a924 Parent: 7bd37e30f2dd4a54283ac57f0df003840fe010d7 Author: Bob Peterson <bob(a)ganesha.peterson&gt; AuthorDate: Mon Jan 25 16:23:19 2010 -0600 Committer: Bob Peterson <rpeterso(a)redhat.com&gt; CommitterDate: Tue Jan 26 14:39:31 2010 -0600 Eliminate unnecessary block_list from gfs2_edit There is no need for a blockmap in gfs2_edit's savemeta function so this patch eliminates it. rhbz#455300 --- gfs2/edit/savemeta.c | 18 +----------------- 1 files changed, 1 insertions(+), 17 deletions(-) diff --git a/gfs2/edit/savemeta.c b/gfs2/edit/savemeta.c index 3e7ec7e..6df3a4b 100644 --- a/gfs2/edit/savemeta.c +++ b/gfs2/edit/savemeta.c @@ -35,7 +35,6 @@ struct saved_metablock { struct saved_metablock *savedata; struct gfs2_buffer_head *savebh; uint64_t last_fs_block, last_reported_block, blks_saved, total_out, pct; -struct gfs2_bmap *blocklist = NULL; uint64_t journal_blocks[MAX_JOURNALS_SAVED]; uint64_t gfs1_journal_size = 0; /* in blocks */ int journals_found = 0; @@ -499,7 +498,6 @@ void savemeta(char *out_fn, int saveoption) int out_fd; int slow; osi_list_t *tmp; - uint64_t memreq; int rgcount; uint64_t jindex_block; struct gfs2_buffer_head *lbh; @@ -599,12 +597,6 @@ void savemeta(char *out_fn, int saveoption) printf("Done.\n\n"); fflush(stdout); } - if (!slow) { - blocklist = gfs2_bmap_create(&sbd, last_fs_block + 1, - &memreq); - if (!blocklist) - slow = TRUE; - } get_journal_inode_blocks(); if (!slow) { /* Save off the superblock */ @@ -631,7 +623,7 @@ void savemeta(char *out_fn, int saveoption) for (tmp = sbd.rglist.next; tmp != &sbd.rglist; tmp = tmp->next){ struct rgrp_list *rgd; - int i, first; + int first; rgd = osi_list_entry(tmp, struct rgrp_list, list); slow = gfs2_rgrp_read(&sbd, rgd); @@ -641,12 +633,6 @@ void savemeta(char *out_fn, int saveoption) (unsigned long long)rgd->ri.ri_addr, (unsigned long long)rgd->ri.ri_addr, rgd->ri.ri_length); - for (i = 0; i < rgd->ri.ri_length; i++) { - if(gfs2_blockmap_set(blocklist, - rgd->ri.ri_addr + i, - gfs2_meta_other)) - break; - } first = 1; /* Save off the rg and bitmaps */ for (block = rgd->ri.ri_addr; @@ -685,8 +671,6 @@ void savemeta(char *out_fn, int saveoption) } } /* Clean up */ - if (blocklist) - gfs2_bmap_destroy(&sbd, blocklist); /* There may be a gap between end of file system and end of device */ /* so we tell the user that we've processed everything. */ block = last_fs_block;