/*
* resize2fs.c --- ext2 main routine
*
- * Copyright (C) 1997 Theodore Ts'o
+ * Copyright (C) 1997, 1998 by Theodore Ts'o and
+ * PowerQuest, Inc.
+ *
+ * Copyright (C) 1999, 2000 by Theosore Ts'o
*
* %Begin-Header%
- * All rights reserved.
+ * This file may be redistributed under the terms of the GNU Public
+ * License.
* %End-Header%
*/
*/
#include "resize2fs.h"
+#include <time.h>
-#ifdef linux /* Kludge for debugging */
+#ifdef __linux__ /* Kludge for debugging */
#define RESIZE2FS_DEBUG
#endif
static errcode_t inode_scan_and_fix(ext2_resize_t rfs);
static errcode_t inode_ref_fix(ext2_resize_t rfs);
static errcode_t move_itables(ext2_resize_t rfs);
+static errcode_t fix_resize_inode(ext2_filsys fs);
static errcode_t ext2fs_calculate_summary_stats(ext2_filsys fs);
/*
/*
* This is the top-level routine which does the dirty deed....
*/
-errcode_t resize_fs(ext2_filsys fs, blk_t new_size, int flags,
- void (*progress)(ext2_resize_t rfs, int pass,
+errcode_t resize_fs(ext2_filsys fs, blk_t *new_size, int flags,
+ errcode_t (*progress)(ext2_resize_t rfs, int pass,
unsigned long cur,
- unsigned long max))
+ unsigned long max_val))
{
ext2_resize_t rfs;
errcode_t retval;
/*
* Create the data structure
*/
- retval = ext2fs_get_mem(sizeof(struct ext2_resize_struct),
- (void **) &rfs);
+ retval = ext2fs_get_mem(sizeof(struct ext2_resize_struct), &rfs);
if (retval)
return retval;
memset(rfs, 0, sizeof(struct ext2_resize_struct));
if (retval)
goto errout;
- retval = adjust_superblock(rfs, new_size);
+ retval = adjust_superblock(rfs, *new_size);
if (retval)
goto errout;
+ *new_size = rfs->new_fs->super->s_blocks_count;
+
retval = blocks_to_move(rfs);
if (retval)
goto errout;
if (retval)
goto errout;
+ retval = move_itables(rfs);
+ if (retval)
+ goto errout;
+
retval = ext2fs_calculate_summary_stats(rfs->new_fs);
if (retval)
goto errout;
- retval = move_itables(rfs);
+ retval = fix_resize_inode(rfs->new_fs);
if (retval)
goto errout;
ext2fs_free(rfs->old_fs);
if (rfs->itable_buf)
- ext2fs_free_mem((void **) &rfs->itable_buf);
- ext2fs_free_mem((void **) &rfs);
+ ext2fs_free_mem(&rfs->itable_buf);
+ ext2fs_free_mem(&rfs);
return 0;
if (rfs->new_fs)
ext2fs_free(rfs->new_fs);
if (rfs->itable_buf)
- ext2fs_free_mem((void **) &rfs->itable_buf);
- ext2fs_free_mem((void **) &rfs);
+ ext2fs_free_mem(&rfs->itable_buf);
+ ext2fs_free_mem(&rfs);
return retval;
}
int overhead = 0;
int rem, adj = 0;
errcode_t retval;
- ino_t real_end;
+ ext2_ino_t real_end;
blk_t blk, group_block;
- unsigned long i, j;
+ unsigned long i, j, old_desc_blocks;
int old_numblocks, numblocks, adjblocks;
+ unsigned int meta_bg, meta_bg_size;
+ int has_super;
unsigned long max_group;
fs = rfs->new_fs;
* includes the superblock backup, the group descriptor
* backups, the inode bitmap, the block bitmap, and the inode
* table.
- *
- * XXX Not all block groups need the descriptor blocks, but
- * being clever is tricky...
*/
- overhead = 3 + fs->desc_blocks + fs->inode_blocks_per_group;
-
+ overhead = (int) (2 + fs->inode_blocks_per_group);
+
+ if (ext2fs_bg_has_super(fs, fs->group_desc_count - 1))
+ overhead += 1 + fs->desc_blocks +
+ fs->super->s_reserved_gdt_blocks;
+
/*
* See if the last group is big enough to support the
* necessary data structures. If not, we need to get rid of
* Reallocate the group descriptors as necessary.
*/
if (rfs->old_fs->desc_blocks != fs->desc_blocks) {
- retval = ext2fs_resize_mem(fs->desc_blocks * fs->blocksize,
- (void **) &fs->group_desc);
+ retval = ext2fs_resize_mem(rfs->old_fs->desc_blocks *
+ fs->blocksize,
+ fs->desc_blocks * fs->blocksize,
+ &fs->group_desc);
if (retval)
goto errout;
}
}
/*
+ * If the resize_inode feature is set, and we are changing the
+ * number of descriptor blocks, then adjust
+ * s_reserved_gdt_blocks if possible to avoid needing to move
+ * the inode table either now or in the future.
+ */
+ if ((fs->super->s_feature_compat &
+ EXT2_FEATURE_COMPAT_RESIZE_INODE) &&
+ (rfs->old_fs->desc_blocks != fs->desc_blocks)) {
+ int new;
+
+ new = ((int) fs->super->s_reserved_gdt_blocks) +
+ (rfs->old_fs->desc_blocks - fs->desc_blocks);
+ if (new < 0)
+ new = 0;
+ if (new > fs->blocksize/4)
+ new = fs->blocksize/4;
+ fs->super->s_reserved_gdt_blocks = new;
+ if (new == 0)
+ fs->super->s_feature_compat &=
+ ~EXT2_FEATURE_COMPAT_RESIZE_INODE;
+ }
+
+ /*
* If we are shrinking the number block groups, we're done and
* can exit now.
*/
* Initialize the new block group descriptors
*/
retval = ext2fs_get_mem(fs->blocksize * fs->inode_blocks_per_group,
- (void **) &rfs->itable_buf);
+ &rfs->itable_buf);
if (retval)
goto errout;
adj = rfs->old_fs->group_desc_count;
max_group = fs->group_desc_count - adj;
- if (rfs->progress)
- rfs->progress(rfs, E2_RSZ_EXTEND_ITABLE_PASS,
- 0, max_group);
+ if (rfs->progress) {
+ retval = rfs->progress(rfs, E2_RSZ_EXTEND_ITABLE_PASS,
+ 0, max_group);
+ if (retval)
+ goto errout;
+ }
+ if (fs->super->s_feature_incompat & EXT2_FEATURE_INCOMPAT_META_BG)
+ old_desc_blocks = fs->super->s_first_meta_bg;
+ else
+ old_desc_blocks = fs->desc_blocks +
+ fs->super->s_reserved_gdt_blocks;
for (i = rfs->old_fs->group_desc_count;
i < fs->group_desc_count; i++) {
memset(&fs->group_desc[i], 0,
} else
numblocks = fs->super->s_blocks_per_group;
- if (ext2fs_bg_has_super(fs, i)) {
- for (j=0; j < fs->desc_blocks+1; j++)
+ has_super = ext2fs_bg_has_super(fs, i);
+ if (has_super) {
+ ext2fs_mark_block_bitmap(fs->block_map, group_block);
+ adjblocks++;
+ }
+ meta_bg_size = (fs->blocksize /
+ sizeof (struct ext2_group_desc));
+ meta_bg = i / meta_bg_size;
+ if (!(fs->super->s_feature_incompat &
+ EXT2_FEATURE_INCOMPAT_META_BG) ||
+ (meta_bg < fs->super->s_first_meta_bg)) {
+ if (has_super) {
+ for (j=0; j < old_desc_blocks; j++)
+ ext2fs_mark_block_bitmap(fs->block_map,
+ group_block + 1 + j);
+ adjblocks += old_desc_blocks;
+ }
+ } else {
+ if (has_super)
+ has_super = 1;
+ if (((i % meta_bg_size) == 0) ||
+ ((i % meta_bg_size) == 1) ||
+ ((i % meta_bg_size) == (meta_bg_size-1)))
ext2fs_mark_block_bitmap(fs->block_map,
- group_block + j);
- adjblocks = 1 + fs->desc_blocks;
+ group_block + has_super);
}
+
adjblocks += 2 + fs->inode_blocks_per_group;
numblocks -= adjblocks;
if (retval) goto errout;
io_channel_flush(fs->io);
- if (rfs->progress)
- rfs->progress(rfs, E2_RSZ_EXTEND_ITABLE_PASS,
- i - adj + 1, max_group);
-
+ if (rfs->progress) {
+ retval = rfs->progress(rfs, E2_RSZ_EXTEND_ITABLE_PASS,
+ i - adj + 1, max_group);
+ if (retval)
+ goto errout;
+ }
group_block += fs->super->s_blocks_per_group;
}
io_channel_flush(fs->io);
* filesystem meta-data blocks.
*/
static errcode_t mark_table_blocks(ext2_filsys fs,
- ext2fs_block_bitmap *ret_bmap)
+ ext2fs_block_bitmap bmap)
{
blk_t block, b;
- int i,j;
- ext2fs_block_bitmap bmap;
+ unsigned int j;
+ dgrp_t i;
+ unsigned long meta_bg, meta_bg_size;
+ int has_super;
+ unsigned int old_desc_blocks;
errcode_t retval;
- retval = ext2fs_allocate_block_bitmap(fs, "meta-data blocks", &bmap);
- if (retval)
- return retval;
-
+ meta_bg_size = (fs->blocksize / sizeof (struct ext2_group_desc));
block = fs->super->s_first_data_block;
+ if (fs->super->s_feature_incompat & EXT2_FEATURE_INCOMPAT_META_BG)
+ old_desc_blocks = fs->super->s_first_meta_bg;
+ else
+ old_desc_blocks = fs->desc_blocks +
+ fs->super->s_reserved_gdt_blocks;
for (i = 0; i < fs->group_desc_count; i++) {
- if (ext2fs_bg_has_super(fs, i)) {
- /*
- * Mark this group's copy of the superblock
- */
- ext2fs_mark_block_bitmap(bmap, block);
-
- /*
- * Mark this group's copy of the descriptors
- */
- for (j = 0; j < fs->desc_blocks; j++)
- ext2fs_mark_block_bitmap(bmap, block + j + 1);
- }
-
+ ext2fs_reserve_super_and_bgd(fs, i, bmap);
+
/*
* Mark the blocks used for the inode table
*/
for (j = 0, b = fs->group_desc[i].bg_inode_table;
- j < fs->inode_blocks_per_group;
+ j < (unsigned int) fs->inode_blocks_per_group;
j++, b++)
ext2fs_mark_block_bitmap(bmap, b);
*/
ext2fs_mark_block_bitmap(bmap,
fs->group_desc[i].bg_block_bitmap);
+
/*
* Mark block used for the inode bitmap
*/
fs->group_desc[i].bg_inode_bitmap);
block += fs->super->s_blocks_per_group;
}
- *ret_bmap = bmap;
return 0;
}
/*
+ * This function checks to see if a particular block (either a
+ * superblock or a block group descriptor) overlaps with an inode or
+ * block bitmap block, or with the inode table.
+ */
+static void mark_fs_metablock(ext2_resize_t rfs,
+ ext2fs_block_bitmap meta_bmap,
+ int group, blk_t blk)
+{
+ ext2_filsys fs = rfs->new_fs;
+
+ ext2fs_mark_block_bitmap(rfs->reserve_blocks, blk);
+ ext2fs_mark_block_bitmap(fs->block_map, blk);
+
+ /*
+ * Check to see if we overlap with the inode or block bitmap,
+ * or the inode tables. If not, and the block is in use, then
+ * mark it as a block to be moved.
+ */
+ if (IS_BLOCK_BM(fs, group, blk)) {
+ FS_BLOCK_BM(fs, group) = 0;
+ rfs->needed_blocks++;
+ } else if (IS_INODE_BM(fs, group, blk)) {
+ FS_INODE_BM(fs, group) = 0;
+ rfs->needed_blocks++;
+ } else if (IS_INODE_TB(fs, group, blk)) {
+ FS_INODE_TB(fs, group) = 0;
+ rfs->needed_blocks++;
+ } else if (ext2fs_test_block_bitmap(rfs->old_fs->block_map, blk) &&
+ !ext2fs_test_block_bitmap(meta_bmap, blk)) {
+ ext2fs_mark_block_bitmap(rfs->move_blocks, blk);
+ rfs->needed_blocks++;
+ }
+}
+
+
+/*
* This routine marks and unmarks reserved blocks in the new block
* bitmap. It also determines which blocks need to be moved and
* places this information into the move_blocks bitmap.
*/
static errcode_t blocks_to_move(ext2_resize_t rfs)
{
- int i, j, max;
- blk_t blk, group_blk;
- unsigned long old_blocks, new_blocks;
+ int j, has_super;
+ dgrp_t i, max_groups;
+ blk_t blk, group_blk;
+ unsigned long old_blocks, new_blocks;
+ unsigned int meta_bg, meta_bg_size;
errcode_t retval;
ext2_filsys fs, old_fs;
ext2fs_block_bitmap meta_bmap;
if (old_fs->super->s_blocks_count > fs->super->s_blocks_count)
fs = rfs->old_fs;
- retval = ext2fs_allocate_block_bitmap(fs, "reserved blocks",
+ retval = ext2fs_allocate_block_bitmap(fs, _("reserved blocks"),
&rfs->reserve_blocks);
if (retval)
return retval;
- retval = ext2fs_allocate_block_bitmap(fs, "blocks to be moved",
+ retval = ext2fs_allocate_block_bitmap(fs, _("blocks to be moved"),
&rfs->move_blocks);
if (retval)
return retval;
- retval = mark_table_blocks(fs, &meta_bmap);
+ retval = ext2fs_allocate_block_bitmap(fs, _("meta-data blocks"),
+ &meta_bmap);
+ if (retval)
+ return retval;
+
+ retval = mark_table_blocks(old_fs, meta_bmap);
if (retval)
return retval;
ext2fs_mark_block_bitmap(rfs->reserve_blocks, blk);
}
- old_blocks = old_fs->desc_blocks;
- new_blocks = fs->desc_blocks;
-
+ if (fs->super->s_feature_incompat & EXT2_FEATURE_INCOMPAT_META_BG) {
+ old_blocks = old_fs->super->s_first_meta_bg;
+ new_blocks = fs->super->s_first_meta_bg;
+ } else {
+ old_blocks = old_fs->desc_blocks + old_fs->super->s_reserved_gdt_blocks;
+ new_blocks = fs->desc_blocks + fs->super->s_reserved_gdt_blocks;
+ }
+
if (old_blocks == new_blocks) {
retval = 0;
goto errout;
}
- max = fs->group_desc_count;
- if (max > old_fs->group_desc_count)
- max = old_fs->group_desc_count;
+ max_groups = fs->group_desc_count;
+ if (max_groups > old_fs->group_desc_count)
+ max_groups = old_fs->group_desc_count;
group_blk = old_fs->super->s_first_data_block;
/*
* If we're reducing the number of descriptor blocks, this
* blocks as free.
*/
if (old_blocks > new_blocks) {
- for (i = 0; i < max; i++) {
+ for (i = 0; i < max_groups; i++) {
if (!ext2fs_bg_has_super(fs, i)) {
group_blk += fs->super->s_blocks_per_group;
continue;
* If we're increasing the number of descriptor blocks, life
* gets interesting....
*/
- for (i = 0; i < max; i++) {
- if (!ext2fs_bg_has_super(fs, i))
- goto next_group;
-
- for (blk = group_blk;
- blk < group_blk + 1 + new_blocks; blk++) {
- ext2fs_mark_block_bitmap(rfs->reserve_blocks, blk);
- ext2fs_mark_block_bitmap(fs->block_map, blk);
-
- /*
- * Check to see if we overlap with the inode
- * or block bitmap, or the inode tables. If
- * not, and the block is in use, then mark it
- * as a block to be moved.
- */
- if (IS_BLOCK_BM(fs, i, blk)) {
- FS_BLOCK_BM(fs, i) = 0;
- rfs->needed_blocks++;
- } else if (IS_INODE_BM(fs, i, blk)) {
- FS_INODE_BM(fs, i) = 0;
- rfs->needed_blocks++;
- } else if (IS_INODE_TB(fs, i, blk)) {
- FS_INODE_TB(fs, i) = 0;
- rfs->needed_blocks++;
- } else if (ext2fs_test_block_bitmap(old_fs->block_map,
- blk) &&
- !ext2fs_test_block_bitmap(meta_bmap, blk)) {
- ext2fs_mark_block_bitmap(rfs->move_blocks,
- blk);
- rfs->needed_blocks++;
+ meta_bg_size = (fs->blocksize / sizeof (struct ext2_group_desc));
+ for (i = 0; i < max_groups; i++) {
+ has_super = ext2fs_bg_has_super(fs, i);
+ if (has_super)
+ mark_fs_metablock(rfs, meta_bmap, i, group_blk);
+
+ meta_bg = i / meta_bg_size;
+ if (!(fs->super->s_feature_incompat &
+ EXT2_FEATURE_INCOMPAT_META_BG) ||
+ (meta_bg < fs->super->s_first_meta_bg)) {
+ if (has_super) {
+ for (blk = group_blk+1;
+ blk < group_blk + 1 + new_blocks; blk++)
+ mark_fs_metablock(rfs, meta_bmap,
+ i, blk);
}
+ } else {
+ if (has_super)
+ has_super = 1;
+ if (((i % meta_bg_size) == 0) ||
+ ((i % meta_bg_size) == 1) ||
+ ((i % meta_bg_size) == (meta_bg_size-1)))
+ mark_fs_metablock(rfs, meta_bmap, i,
+ group_blk + has_super);
}
+
if (fs->group_desc[i].bg_inode_table &&
fs->group_desc[i].bg_inode_bitmap &&
fs->group_desc[i].bg_block_bitmap)
{
rfs->alloc_state = AVOID_OLD;
rfs->new_blk = rfs->new_fs->super->s_first_data_block;
+#if 0
+ /* HACK for testing */
+ if (rfs->new_fs->super->s_blocks_count >
+ rfs->old_fs->super->s_blocks_count)
+ rfs->new_blk = rfs->old_fs->super->s_blocks_count;
+#endif
}
static blk_t get_new_block(ext2_resize_t rfs)
#ifdef RESIZE2FS_DEBUG
if (rfs->flags & RESIZE_DEBUG_BMOVE)
- printf("Going into desperation "
- "mode for block allocations\n");
+ printf("Going into desperation mode "
+ "for block allocations\n");
#endif
rfs->alloc_state = DESPERATION;
rfs->new_blk = fs->super->s_first_data_block;
ext2fs_test_block_bitmap(rfs->reserve_blocks,
rfs->new_blk) ||
((rfs->alloc_state == AVOID_OLD) &&
+ (rfs->new_blk < rfs->old_fs->super->s_blocks_count) &&
ext2fs_test_block_bitmap(rfs->old_fs->block_map,
rfs->new_blk))) {
rfs->new_blk++;
errcode_t retval;
int size, c;
int to_move, moved;
+ ext2_badblocks_list badblock_list = 0;
+ int bb_modified = 0;
+
+ retval = ext2fs_read_bb_inode(old_fs, &badblock_list);
+ if (retval)
+ return retval;
new_blk = fs->super->s_first_data_block;
if (!rfs->itable_buf) {
retval = ext2fs_get_mem(fs->blocksize *
fs->inode_blocks_per_group,
- (void **) &rfs->itable_buf);
+ &rfs->itable_buf);
if (retval)
return retval;
}
continue;
if (!ext2fs_test_block_bitmap(rfs->move_blocks, blk))
continue;
+ if (ext2fs_badblocks_list_test(badblock_list, blk)) {
+ ext2fs_badblocks_list_del(badblock_list, blk);
+ bb_modified++;
+ continue;
+ }
new_blk = get_new_block(rfs);
if (!new_blk) {
}
if (to_move == 0) {
+ if (rfs->bmap) {
+ ext2fs_free_extent_table(rfs->bmap);
+ rfs->bmap = 0;
+ }
retval = 0;
goto errout;
}
retval = ext2fs_iterate_extent(rfs->bmap, 0, 0, 0);
if (retval) goto errout;
- if (rfs->progress)
- (rfs->progress)(rfs, E2_RSZ_BLOCK_RELOC_PASS, 0, to_move);
-
+ if (rfs->progress) {
+ retval = (rfs->progress)(rfs, E2_RSZ_BLOCK_RELOC_PASS,
+ 0, to_move);
+ if (retval)
+ goto errout;
+ }
while (1) {
retval = ext2fs_iterate_extent(rfs->bmap, &old_blk, &new_blk, &size);
if (retval) goto errout;
break;
#ifdef RESIZE2FS_DEBUG
if (rfs->flags & RESIZE_DEBUG_BMOVE)
- printf("Moving %d blocks %u->%u\n", size,
- old_blk, new_blk);
+ printf("Moving %d blocks %u->%u\n",
+ size, old_blk, new_blk);
#endif
do {
c = size;
moved += c;
if (rfs->progress) {
io_channel_flush(fs->io);
- (rfs->progress)(rfs, E2_RSZ_BLOCK_RELOC_PASS,
+ retval = (rfs->progress)(rfs,
+ E2_RSZ_BLOCK_RELOC_PASS,
moved, to_move);
+ if (retval)
+ goto errout;
}
} while (size > 0);
io_channel_flush(fs->io);
}
errout:
+ if (badblock_list) {
+ if (!retval && bb_modified)
+ retval = ext2fs_update_bb_inode(old_fs,
+ badblock_list);
+ ext2fs_badblocks_list_free(badblock_list);
+ }
return retval;
}
struct process_block_struct {
ext2_resize_t rfs;
- ino_t ino;
+ ext2_ino_t ino;
struct ext2_inode * inode;
errcode_t error;
int is_dir;
};
static int process_block(ext2_filsys fs, blk_t *block_nr,
- int blockcnt, blk_t ref_block,
- int ref_offset, void *priv_data)
+ e2_blkcnt_t blockcnt,
+ blk_t ref_block EXT2FS_ATTR((unused)),
+ int ref_offset EXT2FS_ATTR((unused)), void *priv_data)
{
struct process_block_struct *pb;
errcode_t retval;
pb->changed = 1;
#ifdef RESIZE2FS_DEBUG
if (pb->rfs->flags & RESIZE_DEBUG_BMOVE)
- printf("ino=%ld, blockcnt=%d, %u->%u\n",
+ printf("ino=%u, blockcnt=%lld, %u->%u\n",
pb->ino, blockcnt, block, new_block);
#endif
block = new_block;
}
if (pb->is_dir) {
retval = ext2fs_add_dir_block(fs->dblist, pb->ino,
- block, blockcnt);
+ block, (int) blockcnt);
if (retval) {
pb->error = retval;
ret |= BLOCK_ABORT;
/*
* Progress callback
*/
-static errcode_t progress_callback(ext2_filsys fs, ext2_inode_scan scan,
+static errcode_t progress_callback(ext2_filsys fs,
+ ext2_inode_scan scan EXT2FS_ATTR((unused)),
dgrp_t group, void * priv_data)
{
ext2_resize_t rfs = (ext2_resize_t) priv_data;
+ errcode_t retval;
/*
- * The if (group+1) == 0 test is to protect against old ext2
- * libraries. It shouldn't be needed against new libraries.
+ * This check is to protect against old ext2 libraries. It
+ * shouldn't be needed against new libraries.
*/
- if (group == 0 || (group+1) == 0)
+ if ((group+1) == 0)
return 0;
if (rfs->progress) {
io_channel_flush(fs->io);
- (rfs->progress)(rfs, E2_RSZ_INODE_SCAN_PASS,
- group, fs->group_desc_count-1);
+ retval = (rfs->progress)(rfs, E2_RSZ_INODE_SCAN_PASS,
+ group+1, fs->group_desc_count);
+ if (retval)
+ return retval;
}
return 0;
static errcode_t inode_scan_and_fix(ext2_resize_t rfs)
{
struct process_block_struct pb;
- ino_t ino, new_inode;
+ ext2_ino_t ino, new_inode;
struct ext2_inode inode;
ext2_inode_scan scan = NULL;
errcode_t retval;
int group;
char *block_buf = 0;
- ino_t start_to_move;
+ ext2_ino_t start_to_move;
+ blk_t orig_size, new_block;
if ((rfs->old_fs->group_desc_count <=
rfs->new_fs->group_desc_count) &&
!rfs->bmap)
return 0;
+ /*
+ * Save the original size of the old filesystem, and
+ * temporarily set the size to be the new size if the new size
+ * is larger. We need to do this to avoid catching an error
+ * by the block iterator routines
+ */
+ orig_size = rfs->old_fs->super->s_blocks_count;
+ if (orig_size < rfs->new_fs->super->s_blocks_count)
+ rfs->old_fs->super->s_blocks_count =
+ rfs->new_fs->super->s_blocks_count;
+
retval = ext2fs_open_inode_scan(rfs->old_fs, 0, &scan);
if (retval) goto errout;
retval = ext2fs_init_dblist(rfs->old_fs, 0);
if (retval) goto errout;
- retval = ext2fs_get_mem(rfs->old_fs->blocksize * 3,
- (void **) &block_buf);
+ retval = ext2fs_get_mem(rfs->old_fs->blocksize * 3, &block_buf);
if (retval) goto errout;
start_to_move = (rfs->new_fs->group_desc_count *
rfs->new_fs->super->s_inodes_per_group);
- if (rfs->progress)
- (rfs->progress)(rfs, E2_RSZ_INODE_SCAN_PASS,
- 0, rfs->old_fs->group_desc_count-1);
-
+ if (rfs->progress) {
+ retval = (rfs->progress)(rfs, E2_RSZ_INODE_SCAN_PASS,
+ 0, rfs->old_fs->group_desc_count);
+ if (retval)
+ goto errout;
+ }
ext2fs_set_inode_callback(scan, progress_callback, (void *) rfs);
pb.rfs = rfs;
pb.inode = &inode;
if (!ino)
break;
- if (inode.i_links_count == 0)
+ if (inode.i_links_count == 0 && ino != EXT2_RESIZE_INO)
continue; /* inode not in use */
pb.is_dir = LINUX_S_ISDIR(inode.i_mode);
pb.changed = 0;
+ if (inode.i_file_acl && rfs->bmap) {
+ new_block = ext2fs_extent_translate(rfs->bmap,
+ inode.i_file_acl);
+ if (new_block) {
+ inode.i_file_acl = new_block;
+ retval = ext2fs_write_inode(rfs->old_fs,
+ ino, &inode);
+ if (retval) goto errout;
+ }
+ }
+
if (ext2fs_inode_has_valid_blocks(&inode) &&
(rfs->bmap || pb.is_dir)) {
pb.ino = ino;
retval = ext2fs_read_inode(rfs->old_fs, ino, &inode);
if (retval) goto errout;
}
+ inode.i_ctime = time(0);
retval = ext2fs_write_inode(rfs->old_fs, new_inode, &inode);
if (retval) goto errout;
#ifdef RESIZE2FS_DEBUG
if (rfs->flags & RESIZE_DEBUG_INODEMAP)
- printf("Inode moved %ld->%ld\n", ino, new_inode);
+ printf("Inode moved %u->%u\n", ino, new_inode);
#endif
if (!rfs->imap) {
retval = ext2fs_create_extent_table(&rfs->imap, 0);
io_channel_flush(rfs->old_fs->io);
errout:
+ rfs->old_fs->super->s_blocks_count = orig_size;
if (rfs->bmap) {
ext2fs_free_extent_table(rfs->bmap);
rfs->bmap = 0;
if (scan)
ext2fs_close_inode_scan(scan);
if (block_buf)
- ext2fs_free_mem((void **) &block_buf);
+ ext2fs_free_mem(&block_buf);
return retval;
}
struct istruct {
ext2_resize_t rfs;
- unsigned long max;
+ errcode_t err;
+ unsigned long max_dirs;
int num;
};
-static int check_and_change_inodes(ino_t dir, int entry,
+static int check_and_change_inodes(ext2_ino_t dir,
+ int entry EXT2FS_ATTR((unused)),
struct ext2_dir_entry *dirent, int offset,
- int blocksize, char *buf, void *priv_data)
+ int blocksize EXT2FS_ATTR((unused)),
+ char *buf EXT2FS_ATTR((unused)),
+ void *priv_data)
{
struct istruct *is = (struct istruct *) priv_data;
- ino_t new_inode;
+ struct ext2_inode inode;
+ ext2_ino_t new_inode;
+ errcode_t retval;
if (is->rfs->progress && offset == 0) {
io_channel_flush(is->rfs->old_fs->io);
- (is->rfs->progress)(is->rfs, E2_RSZ_INODE_REF_UPD_PASS,
- ++is->num, is->max);
+ is->err = (is->rfs->progress)(is->rfs,
+ E2_RSZ_INODE_REF_UPD_PASS,
+ ++is->num, is->max_dirs);
+ if (is->err)
+ return DIRENT_ABORT;
}
if (!dirent->inode)
return 0;
#ifdef RESIZE2FS_DEBUG
if (is->rfs->flags & RESIZE_DEBUG_INODEMAP)
- printf("Inode translate (dir=%ld, name=%.*s, %u->%ld)\n",
- dir, dirent->name_len, dirent->name,
+ printf("Inode translate (dir=%u, name=%.*s, %u->%u)\n",
+ dir, dirent->name_len&0xFF, dirent->name,
dirent->inode, new_inode);
#endif
dirent->inode = new_inode;
+ /* Update the directory mtime and ctime */
+ retval = ext2fs_read_inode(is->rfs->old_fs, dir, &inode);
+ if (retval == 0) {
+ inode.i_mtime = inode.i_ctime = time(0);
+ ext2fs_write_inode(is->rfs->old_fs, dir, &inode);
+ }
+
return DIRENT_CHANGED;
}
* inode references
*/
is.num = 0;
- is.max = ext2fs_dblist_count(rfs->old_fs->dblist);
+ is.max_dirs = ext2fs_dblist_count(rfs->old_fs->dblist);
is.rfs = rfs;
+ is.err = 0;
- if (rfs->progress)
- (rfs->progress)(rfs, E2_RSZ_INODE_REF_UPD_PASS,
- 0, is.max);
+ if (rfs->progress) {
+ retval = (rfs->progress)(rfs, E2_RSZ_INODE_REF_UPD_PASS,
+ 0, is.max_dirs);
+ if (retval)
+ goto errout;
+ }
retval = ext2fs_dblist_dir_iterate(rfs->old_fs->dblist,
DIRENT_FLAG_INCLUDE_EMPTY, 0,
check_and_change_inodes, &is);
+ if (retval)
+ goto errout;
+ if (is.err) {
+ retval = is.err;
+ goto errout;
+ }
+errout:
ext2fs_free_extent_table(rfs->imap);
rfs->imap = 0;
return retval;
*/
static errcode_t move_itables(ext2_resize_t rfs)
{
- int i, n, num, max, size, diff;
+ int n, num, size, diff;
+ dgrp_t i, max_groups;
ext2_filsys fs = rfs->new_fs;
char *cp;
- blk_t old_blk, new_blk;
+ blk_t old_blk, new_blk, blk;
errcode_t retval;
- int to_move, moved;
+ int j, to_move, moved;
- max = fs->group_desc_count;
- if (max > rfs->old_fs->group_desc_count)
- max = rfs->old_fs->group_desc_count;
+ max_groups = fs->group_desc_count;
+ if (max_groups > rfs->old_fs->group_desc_count)
+ max_groups = rfs->old_fs->group_desc_count;
size = fs->blocksize * fs->inode_blocks_per_group;
if (!rfs->itable_buf) {
- retval = ext2fs_get_mem(size, (void **) &rfs->itable_buf);
+ retval = ext2fs_get_mem(size, &rfs->itable_buf);
if (retval)
return retval;
}
* Figure out how many inode tables we need to move
*/
to_move = moved = 0;
- for (i=0; i < max; i++)
+ for (i=0; i < max_groups; i++)
if (rfs->old_fs->group_desc[i].bg_inode_table !=
fs->group_desc[i].bg_inode_table)
to_move++;
if (to_move == 0)
return 0;
- if (rfs->progress)
- rfs->progress(rfs, E2_RSZ_MOVE_ITABLE_PASS, 0, to_move);
+ if (rfs->progress) {
+ retval = rfs->progress(rfs, E2_RSZ_MOVE_ITABLE_PASS,
+ 0, to_move);
+ if (retval)
+ goto errout;
+ }
rfs->old_fs->flags |= EXT2_FLAG_MASTER_SB_ONLY;
- for (i=0; i < max; i++) {
+ for (i=0; i < max_groups; i++) {
old_blk = rfs->old_fs->group_desc[i].bg_inode_table;
new_blk = fs->group_desc[i].bg_inode_table;
diff = new_blk - old_blk;
#ifdef RESIZE2FS_DEBUG
if (rfs->flags & RESIZE_DEBUG_ITABLEMOVE)
- printf("Itable move group %d block "
- "%u->%u (diff %d)\n",
+ printf("Itable move group %d block %u->%u (diff %d)\n",
i, old_blk, new_blk, diff);
#endif
if (retval)
goto errout;
}
+
+ for (blk = rfs->old_fs->group_desc[i].bg_inode_table, j=0;
+ j < fs->inode_blocks_per_group ; j++, blk++)
+ ext2fs_unmark_block_bitmap(fs->block_map, blk);
+
rfs->old_fs->group_desc[i].bg_inode_table = new_blk;
ext2fs_mark_super_dirty(rfs->old_fs);
+ ext2fs_flush(rfs->old_fs);
+
if (rfs->progress) {
- ext2fs_flush(rfs->old_fs);
- rfs->progress(rfs, E2_RSZ_MOVE_ITABLE_PASS,
- ++moved, to_move);
+ retval = rfs->progress(rfs, E2_RSZ_MOVE_ITABLE_PASS,
+ ++moved, to_move);
+ if (retval)
+ goto errout;
}
}
+ mark_table_blocks(fs, fs->block_map);
ext2fs_flush(fs);
#ifdef RESIZE2FS_DEBUG
if (rfs->flags & RESIZE_DEBUG_ITABLEMOVE)
}
/*
+ * Fix the resize inode
+ */
+static errcode_t fix_resize_inode(ext2_filsys fs)
+{
+ struct ext2_inode inode;
+ errcode_t retval;
+ char * block_buf;
+
+ if (!(fs->super->s_feature_compat &
+ EXT2_FEATURE_COMPAT_RESIZE_INODE))
+ return 0;
+
+ retval = ext2fs_get_mem(fs->blocksize, &block_buf);
+ if (retval) goto errout;
+
+ retval = ext2fs_read_inode(fs, EXT2_RESIZE_INO, &inode);
+ if (retval) goto errout;
+
+ inode.i_blocks = fs->blocksize/512;
+
+ retval = ext2fs_write_inode(fs, EXT2_RESIZE_INO, &inode);
+ if (retval) goto errout;
+
+ if (!inode.i_block[EXT2_DIND_BLOCK]) {
+ /*
+ * Avoid zeroing out block #0; that's rude. This
+ * should never happen anyway since the filesystem
+ * should be fsck'ed and we assume it is consistent.
+ */
+ fprintf(stderr,
+ _("Should never happen: resize inode corrupt!\n"));
+ exit(1);
+ }
+
+ memset(block_buf, 0, fs->blocksize);
+
+ retval = io_channel_write_blk(fs->io, inode.i_block[EXT2_DIND_BLOCK],
+ 1, block_buf);
+ if (retval) goto errout;
+
+ retval = ext2fs_create_resize_inode(fs);
+ if (retval)
+ goto errout;
+
+errout:
+ if (block_buf)
+ ext2fs_free_mem(&block_buf);
+ return retval;
+}
+
+/*
* Finally, recalculate the summary information
*/
static errcode_t ext2fs_calculate_summary_stats(ext2_filsys fs)
{
- blk_t blk;
- ino_t ino;
- int group = 0;
- int count = 0;
- int total_free = 0;
- int group_free = 0;
+ blk_t blk;
+ ext2_ino_t ino;
+ unsigned int group = 0;
+ unsigned int count = 0;
+ int total_free = 0;
+ int group_free = 0;
/*
* First calculate the block statistics
git://git.whamcloud.com / tools / e2fsprogs.git / blobdiff