Remove trailing whitespace for the entire source tree
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
diff --git a/resize/extent.c b/resize/extent.c
index ca2c68c..2ed7591 100644
--- a/resize/extent.c
+++ b/resize/extent.c
@@ -9,7 +9,7 @@
* PowerQuest, Inc.
*
* Copyright (C) 1999, 2000 by Theosore Ts'o
- *
+ *
* %Begin-Header%
* This file may be redistributed under the terms of the GNU Public
* License.
@@ -34,11 +34,11 @@
/*
* Create an extent table
*/
-errcode_t ext2fs_create_extent_table(ext2_extent *ret_extent, int size)
+errcode_t ext2fs_create_extent_table(ext2_extent *ret_extent, int size)
{
ext2_extent extent;
errcode_t retval;
-
+
retval = ext2fs_get_mem(sizeof(struct _ext2_extent), &extent);
if (retval)
return retval;
@@ -86,9 +86,9 @@
if (extent->num >= extent->size) {
newsize = extent->size + 100;
- retval = ext2fs_resize_mem(sizeof(struct ext2_extent_entry) *
- extent->size,
- sizeof(struct ext2_extent_entry) *
+ retval = ext2fs_resize_mem(sizeof(struct ext2_extent_entry) *
+ extent->size,
+ sizeof(struct ext2_extent_entry) *
newsize, &extent->list);
if (retval)
return retval;
@@ -128,12 +128,12 @@
{
const struct ext2_extent_entry *db_a;
const struct ext2_extent_entry *db_b;
-
+
db_a = (const struct ext2_extent_entry *) a;
db_b = (const struct ext2_extent_entry *) b;
-
+
return (db_a->old_loc - db_b->old_loc);
-}
+}
/*
* Given an inode map and inode number, look up the old inode number
@@ -167,7 +167,7 @@
range = 0;
else if (old_loc > highval)
range = 1;
- else
+ else
range = ((float) (old_loc - lowval)) /
(highval - lowval);
mid = low + ((int) (range * (high-low)));
@@ -192,7 +192,7 @@
{
int i;
struct ext2_extent_entry *ent;
-
+
fputs(_("# Extent dump:\n"), out);
fprintf(out, _("#\tNum=%d, Size=%d, Cursor=%d, Sorted=%d\n"),
extent->num, extent->size, extent->cursor, extent->sorted);
@@ -209,7 +209,7 @@
__u32 *new_loc, int *size)
{
struct ext2_extent_entry *ent;
-
+
if (!old_loc) {
extent->cursor = 0;
return 0;
@@ -229,7 +229,7 @@
*size = ent->size;
return 0;
}
-
-
-
-
+
+
+
+
diff --git a/resize/main.c b/resize/main.c
index 1cb0b20..aeac24b 100644
--- a/resize/main.c
+++ b/resize/main.c
@@ -5,7 +5,7 @@
* PowerQuest, Inc.
*
* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 by Theodore Ts'o
- *
+ *
* %Begin-Header%
* This file may be redistributed under the terms of the GNU Public
* License.
@@ -108,11 +108,11 @@
has_sb = ext2fs_bg_has_super(fs, group);
if (group == 0 || has_sb != prev_has_sb)
goto next;
- b_stride = fs->group_desc[group].bg_block_bitmap -
- fs->group_desc[group-1].bg_block_bitmap -
+ b_stride = fs->group_desc[group].bg_block_bitmap -
+ fs->group_desc[group-1].bg_block_bitmap -
fs->super->s_blocks_per_group;
- i_stride = fs->group_desc[group].bg_inode_bitmap -
- fs->group_desc[group-1].bg_inode_bitmap -
+ i_stride = fs->group_desc[group].bg_inode_bitmap -
+ fs->group_desc[group-1].bg_inode_bitmap -
fs->super->s_blocks_per_group;
if (b_stride != i_stride ||
b_stride < 0)
@@ -121,7 +121,7 @@
/* printf("group %d has stride %d\n", group, b_stride); */
sum += b_stride;
num++;
-
+
next:
prev_has_sb = has_sb;
}
@@ -223,7 +223,7 @@
new_size_str = argv[optind++];
if (optind < argc)
usage(program_name);
-
+
io_options = strchr(device_name, '?');
if (io_options)
*io_options++ = 0;
@@ -238,7 +238,7 @@
if (!mtpt)
return ENOMEM;
mtpt[len-1] = 0;
- retval = ext2fs_check_mount_point(device_name, &mount_flags,
+ retval = ext2fs_check_mount_point(device_name, &mount_flags,
mtpt, len);
if (retval) {
com_err("ext2fs_check_mount_point", retval,
@@ -269,16 +269,16 @@
ret = fstat(fd, &st_buf);
#endif
if (ret < 0) {
- com_err("open", errno,
+ com_err("open", errno,
_("while getting stat information for %s"),
device_name);
exit(1);
}
-
+
if (flush) {
retval = ext2fs_sync_device(fd, 1);
if (retval) {
- com_err(argv[0], retval,
+ com_err(argv[0], retval,
_("while trying to flush %s"),
device_name);
exit(1);
@@ -293,12 +293,12 @@
if (flags & RESIZE_DEBUG_IO) {
io_ptr = test_io_manager;
test_io_backing_manager = unix_io_manager;
- } else
+ } else
io_ptr = unix_io_manager;
if (!(mount_flags & EXT2_MF_MOUNTED))
io_flags = EXT2_FLAG_RW | EXT2_FLAG_EXCLUSIVE;
- retval = ext2fs_open2(device_name, io_options, io_flags,
+ retval = ext2fs_open2(device_name, io_options, io_flags,
0, 0, io_ptr, &fs);
if (retval) {
com_err (program_name, retval, _("while trying to open %s"),
@@ -335,7 +335,7 @@
device_name);
exit(1);
}
-
+
if (print_min_size) {
printf(_("Estimated minimum size of the filesystem: %u\n"),
calculate_minimum_resize_size(fs));
@@ -369,7 +369,7 @@
if (force_min_size)
new_size = calculate_minimum_resize_size(fs);
else if (new_size_str) {
- new_size = parse_num_blocks(new_size_str,
+ new_size = parse_num_blocks(new_size_str,
fs->super->s_log_block_size);
} else {
new_size = max_size;
@@ -380,7 +380,7 @@
if (use_stride >= 0) {
if (use_stride >= (int) fs->super->s_blocks_per_group) {
- com_err(program_name, 0,
+ com_err(program_name, 0,
_("Invalid stride length"));
exit(1);
}
@@ -388,14 +388,14 @@
ext2fs_mark_super_dirty(fs);
} else
determine_fs_stride(fs);
-
+
/*
* If we are resizing a plain file, and it's not big enough,
* automatically extend it in a sparse fashion by writing the
* last requested block.
*/
new_file_size = ((__u64) new_size) * fs->blocksize;
- if ((__u64) new_file_size >
+ if ((__u64) new_file_size >
(((__u64) 1) << (sizeof(st_buf.st_size)*8 - 1)) - 1)
fd = -1;
if ((new_file_size > st_buf.st_size) &&
@@ -422,7 +422,7 @@
if (!force && ((fs->super->s_lastcheck < fs->super->s_mtime) ||
(fs->super->s_state & EXT2_ERROR_FS) ||
((fs->super->s_state & EXT2_VALID_FS) == 0))) {
- fprintf(stderr,
+ fprintf(stderr,
_("Please run 'e2fsck -f %s' first.\n\n"),
device_name);
exit(1);
diff --git a/resize/online.c b/resize/online.c
index 5d59604..f4d24ce 100644
--- a/resize/online.c
+++ b/resize/online.c
@@ -1,8 +1,8 @@
/*
* online.c --- Do on-line resizing of the ext3 filesystem
*
- * Copyright (C) 2006 by Theodore Ts'o
- *
+ * Copyright (C) 2006 by Theodore Ts'o
+ *
* %Begin-Header%
* This file may be redistributed under the terms of the GNU Public
* License.
@@ -18,7 +18,7 @@
extern char *program_name;
-errcode_t online_resize_fs(ext2_filsys fs, const char *mtpt,
+errcode_t online_resize_fs(ext2_filsys fs, const char *mtpt,
blk_t *new_size, int flags EXT2FS_ATTR((unused)))
{
#ifdef __linux__
@@ -44,7 +44,7 @@
}
/*
- * If the number of descriptor blocks is going to increase,
+ * If the number of descriptor blocks is going to increase,
* the on-line resizing inode must be present.
*/
new_desc_blocks = ext2fs_div_ceil(
@@ -52,19 +52,19 @@
fs->super->s_first_data_block,
EXT2_BLOCKS_PER_GROUP(fs->super)),
EXT2_DESC_PER_BLOCK(fs->super));
- printf("old desc_blocks = %lu, new_desc_blocks = %lu\n",
+ printf("old desc_blocks = %lu, new_desc_blocks = %lu\n",
fs->desc_blocks, new_desc_blocks);
- if (!(fs->super->s_feature_compat &
+ if (!(fs->super->s_feature_compat &
EXT2_FEATURE_COMPAT_RESIZE_INODE) &&
new_desc_blocks != fs->desc_blocks) {
- com_err(program_name, 0,
+ com_err(program_name, 0,
_("Filesystem does not support online resizing"));
exit(1);
}
fd = open(mtpt, O_RDONLY);
if (fd < 0) {
- com_err(program_name, errno,
+ com_err(program_name, errno,
_("while trying to open mountpoint %s"), mtpt);
exit(1);
}
@@ -72,13 +72,13 @@
size=sb->s_blocks_count;
if (ioctl(fd, EXT2_IOC_GROUP_EXTEND, &size)) {
if (errno == EPERM)
- com_err(program_name, 0,
+ com_err(program_name, 0,
_("Permission denied to resize filesystem"));
else if (errno == ENOTTY)
- com_err(program_name, 0,
+ com_err(program_name, 0,
_("Kernel does not support online resizing"));
- else
- com_err(program_name, errno,
+ else
+ com_err(program_name, errno,
_("While checking for on-line resizing support"));
exit(1);
}
@@ -100,13 +100,13 @@
printf(_("Performing an on-line resize of %s to %u (%dk) blocks.\n"),
fs->device_name, *new_size, fs->blocksize / 1024);
- size = fs->group_desc_count * sb->s_blocks_per_group +
+ size = fs->group_desc_count * sb->s_blocks_per_group +
sb->s_first_data_block;
if (size > *new_size)
size = *new_size;
if (ioctl(fd, EXT2_IOC_GROUP_EXTEND, &size)) {
- com_err(program_name, errno,
+ com_err(program_name, errno,
_("While trying to extend the last group"));
exit(1);
}
@@ -117,7 +117,7 @@
overhead = (int) (2 + new_fs->inode_blocks_per_group);
if (ext2fs_bg_has_super(new_fs, new_fs->group_desc_count - 1))
- overhead += 1 + new_fs->desc_blocks +
+ overhead += 1 + new_fs->desc_blocks +
new_fs->super->s_reserved_gdt_blocks;
input.group = i;
@@ -127,7 +127,7 @@
input.blocks_count = sb->s_blocks_per_group;
if (i == new_fs->group_desc_count-1) {
input.blocks_count = new_fs->super->s_blocks_count -
- sb->s_first_data_block -
+ sb->s_first_data_block -
(i * sb->s_blocks_per_group);
}
input.reserved_blocks = (blk_t) (percent * input.blocks_count
@@ -136,16 +136,16 @@
#if 0
printf("new block bitmap is at 0x%04x\n", input.block_bitmap);
printf("new inode bitmap is at 0x%04x\n", input.inode_bitmap);
- printf("new inode table is at 0x%04x-0x%04x\n",
+ printf("new inode table is at 0x%04x-0x%04x\n",
input.inode_table,
input.inode_table + new_fs->inode_blocks_per_group-1);
printf("new group has %u blocks\n", input.blocks_count);
- printf("new group will reserve %d blocks\n",
+ printf("new group will reserve %d blocks\n",
input.reserved_blocks);
- printf("new group has %d free blocks\n",
+ printf("new group has %d free blocks\n",
new_fs->group_desc[i].bg_free_blocks_count);
printf("new group has %d free inodes (%d blocks)\n",
- new_fs->group_desc[i].bg_free_inodes_count,
+ new_fs->group_desc[i].bg_free_inodes_count,
new_fs->inode_blocks_per_group);
printf("Adding group #%d\n", input.group);
#endif
@@ -165,8 +165,8 @@
input64.unused = input.unused;
if (ioctl(fd, EXT4_IOC_GROUP_ADD, &input64) < 0) {
- com_err(program_name, errno,
- _("While trying to add group #%d"),
+ com_err(program_name, errno,
+ _("While trying to add group #%d"),
input.group);
exit(1);
}
diff --git a/resize/resize2fs.c b/resize/resize2fs.c
index cb8d565..f392867 100644
--- a/resize/resize2fs.c
+++ b/resize/resize2fs.c
@@ -5,7 +5,7 @@
* PowerQuest, Inc.
*
* Copyright (C) 1999, 2000 by Theosore Ts'o
- *
+ *
* %Begin-Header%
* This file may be redistributed under the terms of the GNU Public
* License.
@@ -82,7 +82,7 @@
retval = ext2fs_read_bitmaps(fs);
if (retval)
return retval;
-
+
/*
* Create the data structure
*/
@@ -123,7 +123,7 @@
rfs->new_fs->super->s_free_blocks_count,
rfs->needed_blocks);
#endif
-
+
retval = block_mover(rfs);
if (retval)
goto errout;
@@ -143,23 +143,23 @@
retval = ext2fs_calculate_summary_stats(rfs->new_fs);
if (retval)
goto errout;
-
+
retval = fix_resize_inode(rfs->new_fs);
if (retval)
goto errout;
- rfs->new_fs->flags &= ~EXT2_FLAG_MASTER_SB_ONLY;
+ rfs->new_fs->flags &= ~EXT2_FLAG_MASTER_SB_ONLY;
retval = ext2fs_close(rfs->new_fs);
if (retval)
goto errout;
rfs->flags = flags;
-
+
ext2fs_free(rfs->old_fs);
if (rfs->itable_buf)
ext2fs_free_mem(&rfs->itable_buf);
ext2fs_free_mem(&rfs);
-
+
return 0;
errout:
@@ -198,7 +198,7 @@
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 +
+ old_desc_blocks = fs->desc_blocks +
fs->super->s_reserved_gdt_blocks;
for (i=0; i < fs->super->s_blocks_per_group; i++, blk++) {
@@ -258,7 +258,7 @@
EXT2_BLOCKS_PER_GROUP(fs->super));
if (fs->group_desc_count == 0)
return EXT2_ET_TOOSMALL;
- fs->desc_blocks = ext2fs_div_ceil(fs->group_desc_count,
+ fs->desc_blocks = ext2fs_div_ceil(fs->group_desc_count,
EXT2_DESC_PER_BLOCK(fs->super));
/*
@@ -270,7 +270,7 @@
overhead = (int) (2 + fs->inode_blocks_per_group);
if (ext2fs_bg_has_super(fs, fs->group_desc_count - 1))
- overhead += 1 + fs->desc_blocks +
+ overhead += 1 + fs->desc_blocks +
fs->super->s_reserved_gdt_blocks;
/*
@@ -324,7 +324,7 @@
fs->super->s_inodes_count,
fs->inode_map);
if (retval) goto errout;
-
+
real_end = ((EXT2_BLOCKS_PER_GROUP(fs->super)
* fs->group_desc_count)) - 1 +
fs->super->s_first_data_block;
@@ -343,8 +343,8 @@
&fs->group_desc);
if (retval)
goto errout;
- if (fs->desc_blocks > old_fs->desc_blocks)
- memset((char *) fs->group_desc +
+ if (fs->desc_blocks > old_fs->desc_blocks)
+ memset((char *) fs->group_desc +
(old_fs->desc_blocks * fs->blocksize), 0,
(fs->desc_blocks - old_fs->desc_blocks) *
fs->blocksize);
@@ -356,12 +356,12 @@
* 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 &
+ if ((fs->super->s_feature_compat &
EXT2_FEATURE_COMPAT_RESIZE_INODE) &&
(old_fs->desc_blocks != fs->desc_blocks)) {
int new;
- new = ((int) fs->super->s_reserved_gdt_blocks) +
+ new = ((int) fs->super->s_reserved_gdt_blocks) +
(old_fs->desc_blocks - fs->desc_blocks);
if (new < 0)
new = 0;
@@ -422,7 +422,7 @@
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 +
+ old_desc_blocks = fs->desc_blocks +
fs->super->s_reserved_gdt_blocks;
for (i = old_fs->group_desc_count;
i < fs->group_desc_count; i++) {
@@ -472,9 +472,9 @@
ext2fs_block_alloc_stats(fs,
group_block + has_super, +1);
}
-
+
adjblocks += 2 + fs->inode_blocks_per_group;
-
+
numblocks -= adjblocks;
fs->super->s_free_blocks_count -= adjblocks;
fs->super->s_free_inodes_count +=
@@ -508,7 +508,7 @@
blk_t group_block;
unsigned long i;
unsigned long max_group;
-
+
fs = rfs->new_fs;
ext2fs_mark_super_dirty(fs);
ext2fs_mark_bb_dirty(fs);
@@ -623,11 +623,11 @@
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 +
+ old_desc_blocks = fs->desc_blocks +
fs->super->s_reserved_gdt_blocks;
for (i = 0; i < fs->group_desc_count; i++) {
ext2fs_reserve_super_and_bgd(fs, i, bmap);
-
+
/*
* Mark the blocks used for the inode table
*/
@@ -635,15 +635,15 @@
j < (unsigned int) fs->inode_blocks_per_group;
j++, b++)
ext2fs_mark_block_bitmap(bmap, b);
-
+
/*
- * Mark block used for the block bitmap
+ * Mark block used for the block bitmap
*/
ext2fs_mark_block_bitmap(bmap,
fs->group_desc[i].bg_block_bitmap);
/*
- * Mark block used for the inode bitmap
+ * Mark block used for the inode bitmap
*/
ext2fs_mark_block_bitmap(bmap,
fs->group_desc[i].bg_inode_bitmap);
@@ -661,7 +661,7 @@
int group, blk_t blk)
{
ext2_filsys fs = rfs->new_fs;
-
+
ext2fs_mark_block_bitmap(rfs->reserve_blocks, blk);
ext2fs_block_alloc_stats(fs, blk, +1);
@@ -715,7 +715,7 @@
old_fs = rfs->old_fs;
if (old_fs->super->s_blocks_count > fs->super->s_blocks_count)
fs = rfs->old_fs;
-
+
retval = ext2fs_allocate_block_bitmap(fs, _("reserved blocks"),
&rfs->reserve_blocks);
if (retval)
@@ -726,17 +726,17 @@
if (retval)
return retval;
- retval = ext2fs_allocate_block_bitmap(fs, _("meta-data blocks"),
+ 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;
fs = rfs->new_fs;
-
+
/*
* If we're shrinking the filesystem, we need to move all of
* the blocks that don't fit any more
@@ -762,7 +762,7 @@
}
ext2fs_mark_block_bitmap(rfs->reserve_blocks, blk);
}
-
+
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;
@@ -770,7 +770,7 @@
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;
@@ -803,7 +803,7 @@
}
/*
* If we're increasing the number of descriptor blocks, life
- * gets interesting....
+ * gets interesting....
*/
meta_bg_size = EXT2_DESC_PER_BLOCK(fs->super);
for (i = 0; i < max_groups; i++) {
@@ -818,7 +818,7 @@
if (has_super) {
for (blk = group_blk+1;
blk < group_blk + 1 + new_blocks; blk++)
- mark_fs_metablock(rfs, meta_bmap,
+ mark_fs_metablock(rfs, meta_bmap,
i, blk);
}
} else {
@@ -895,7 +895,7 @@
/*
* Mark the new inode table as in use in the new block
- * allocation bitmap, and move any blocks that might
+ * allocation bitmap, and move any blocks that might
* be necessary.
*/
for (blk = fs->group_desc[i].bg_inode_table, j=0;
@@ -906,7 +906,7 @@
ext2fs_mark_block_bitmap(rfs->move_blocks,
blk);
}
-
+
/*
* Make sure the old inode table is reserved in the
* block reservation bitmap.
@@ -914,7 +914,7 @@
for (blk = rfs->old_fs->group_desc[i].bg_inode_table, j=0;
j < fs->inode_blocks_per_group ; j++, blk++)
ext2fs_mark_block_bitmap(rfs->reserve_blocks, blk);
-
+
next_group:
group_blk += rfs->new_fs->super->s_blocks_per_group;
}
@@ -923,7 +923,7 @@
errout:
if (meta_bmap)
ext2fs_free_block_bitmap(meta_bmap);
-
+
return retval;
}
@@ -959,7 +959,7 @@
static blk_t get_new_block(ext2_resize_t rfs)
{
ext2_filsys fs = rfs->new_fs;
-
+
while (1) {
if (rfs->new_blk >= fs->super->s_blocks_count) {
if (rfs->alloc_state == DESPERATION)
@@ -969,7 +969,7 @@
if (rfs->flags & RESIZE_DEBUG_BMOVE)
printf("Going into desperation mode "
"for block allocations\n");
-#endif
+#endif
rfs->alloc_state = DESPERATION;
rfs->new_blk = fs->super->s_first_data_block;
continue;
@@ -1019,7 +1019,7 @@
int to_move, moved;
ext2_badblocks_list badblock_list = 0;
int bb_modified = 0;
-
+
fs->get_alloc_block = resize2fs_get_alloc_block;
old_fs->get_alloc_block = resize2fs_get_alloc_block;
@@ -1066,7 +1066,7 @@
ext2fs_add_extent_entry(rfs->bmap, blk, new_blk);
to_move++;
}
-
+
if (to_move == 0) {
if (rfs->bmap) {
ext2fs_free_extent_table(rfs->bmap);
@@ -1153,7 +1153,7 @@
};
static int process_block(ext2_filsys fs, blk_t *block_nr,
- e2_blkcnt_t blockcnt,
+ e2_blkcnt_t blockcnt,
blk_t ref_block EXT2FS_ATTR((unused)),
int ref_offset EXT2FS_ATTR((unused)), void *priv_data)
{
@@ -1172,7 +1172,7 @@
pb->changed = 1;
#ifdef RESIZE2FS_DEBUG
if (pb->rfs->flags & RESIZE_DEBUG_BMOVE)
- printf("ino=%u, blockcnt=%lld, %u->%u\n",
+ printf("ino=%u, blockcnt=%lld, %u->%u\n",
pb->ino, blockcnt, block, new_block);
#endif
block = new_block;
@@ -1192,7 +1192,7 @@
/*
* Progress callback
*/
-static errcode_t progress_callback(ext2_filsys fs,
+static errcode_t progress_callback(ext2_filsys fs,
ext2_inode_scan scan EXT2FS_ATTR((unused)),
dgrp_t group, void * priv_data)
{
@@ -1213,7 +1213,7 @@
if (retval)
return retval;
}
-
+
return 0;
}
@@ -1228,7 +1228,7 @@
ext2_ino_t start_to_move;
blk_t orig_size, new_block;
int inode_size;
-
+
if ((rfs->old_fs->group_desc_count <=
rfs->new_fs->group_desc_count) &&
!rfs->bmap)
@@ -1255,7 +1255,7 @@
start_to_move = (rfs->new_fs->group_desc_count *
rfs->new_fs->super->s_inodes_per_group);
-
+
if (rfs->progress) {
retval = (rfs->progress)(rfs, E2_RSZ_INODE_SCAN_PASS,
0, rfs->old_fs->group_desc_count);
@@ -1290,16 +1290,16 @@
pb.changed = 0;
if (inode->i_file_acl && rfs->bmap) {
- new_block = ext2fs_extent_translate(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_full(rfs->old_fs,
+ retval = ext2fs_write_inode_full(rfs->old_fs,
ino, inode, inode_size);
if (retval) goto errout;
}
}
-
+
if (ext2fs_inode_has_valid_blocks(inode) &&
(rfs->bmap || pb.is_dir)) {
pb.ino = ino;
@@ -1379,11 +1379,11 @@
int num;
};
-static int check_and_change_inodes(ext2_ino_t dir,
+static int check_and_change_inodes(ext2_ino_t dir,
int entry EXT2FS_ATTR((unused)),
struct ext2_dir_entry *dirent, int offset,
int blocksize EXT2FS_ATTR((unused)),
- char *buf EXT2FS_ATTR((unused)),
+ char *buf EXT2FS_ATTR((unused)),
void *priv_data)
{
struct istruct *is = (struct istruct *) priv_data;
@@ -1432,10 +1432,10 @@
{
errcode_t retval;
struct istruct is;
-
+
if (!rfs->imap)
return 0;
-
+
/*
* Now, we iterate over all of the directories to update the
* inode references
@@ -1451,7 +1451,7 @@
if (retval)
goto errout;
}
-
+
retval = ext2fs_dblist_dir_iterate(rfs->old_fs->dblist,
DIRENT_FLAG_INCLUDE_EMPTY, 0,
check_and_change_inodes, &is);
@@ -1539,20 +1539,20 @@
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)
+ if (rfs->flags & RESIZE_DEBUG_ITABLEMOVE)
printf("Itable move group %d block %u->%u (diff %d)\n",
i, old_blk, new_blk, diff);
#endif
-
+
if (!diff)
continue;
retval = io_channel_read_blk(fs->io, old_blk,
fs->inode_blocks_per_group,
rfs->itable_buf);
- if (retval)
+ if (retval)
goto errout;
/*
* The end of the inode table segment often contains
@@ -1566,7 +1566,7 @@
break;
n = n >> EXT2_BLOCK_SIZE_BITS(fs->super);
#ifdef RESIZE2FS_DEBUG
- if (rfs->flags & RESIZE_DEBUG_ITABLEMOVE)
+ if (rfs->flags & RESIZE_DEBUG_ITABLEMOVE)
printf("%d blocks of zeros...\n", n);
#endif
num = fs->inode_blocks_per_group;
@@ -1609,17 +1609,17 @@
mark_table_blocks(fs, fs->block_map);
ext2fs_flush(fs);
#ifdef RESIZE2FS_DEBUG
- if (rfs->flags & RESIZE_DEBUG_ITABLEMOVE)
+ if (rfs->flags & RESIZE_DEBUG_ITABLEMOVE)
printf("Inode table move finished.\n");
#endif
return 0;
-
+
errout:
return retval;
}
/*
- * Fix the resize inode
+ * Fix the resize inode
*/
static errcode_t fix_resize_inode(ext2_filsys fs)
{
@@ -1628,7 +1628,7 @@
char * block_buf;
blk_t blk;
- if (!(fs->super->s_feature_compat &
+ if (!(fs->super->s_feature_compat &
EXT2_FEATURE_COMPAT_RESIZE_INODE))
return 0;
@@ -1639,7 +1639,7 @@
if (retval) goto errout;
if (fs->super->s_reserved_gdt_blocks == 0) {
- fs->super->s_feature_compat &=
+ fs->super->s_feature_compat &=
~EXT2_FEATURE_COMPAT_RESIZE_INODE;
ext2fs_mark_super_dirty(fs);
@@ -1658,12 +1658,12 @@
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,
+ fprintf(stderr,
_("Should never happen: resize inode corrupt!\n"));
exit(1);
}
@@ -1673,7 +1673,7 @@
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;
@@ -1750,7 +1750,7 @@
}
}
fs->super->s_free_blocks_count = total_free;
-
+
/*
* Next, calculate the inode statistics
*/
diff --git a/resize/resize2fs.h b/resize/resize2fs.h
index 49b77d8..ed25b06 100644
--- a/resize/resize2fs.h
+++ b/resize/resize2fs.h
@@ -5,7 +5,7 @@
* PowerQuest, Inc.
*
* Copyright (C) 1999, 2000 by Theosore Ts'o
- *
+ *
* %Begin-Header%
* This file may be redistributed under the terms of the GNU Public
* License.
@@ -127,7 +127,7 @@
int pass, unsigned long cur,
unsigned long max));
-extern errcode_t adjust_fs_info(ext2_filsys fs, ext2_filsys old_fs,
+extern errcode_t adjust_fs_info(ext2_filsys fs, ext2_filsys old_fs,
blk_t new_size);
extern blk_t calculate_minimum_resize_size(ext2_filsys fs);
@@ -144,7 +144,7 @@
__u32 *new_loc, int *size);
/* online.c */
-extern errcode_t online_resize_fs(ext2_filsys fs, const char *mtpt,
+extern errcode_t online_resize_fs(ext2_filsys fs, const char *mtpt,
blk_t *new_size, int flags);
/* sim_progress.c */
diff --git a/resize/sim_progress.c b/resize/sim_progress.c
index 400e364..a575633 100644
--- a/resize/sim_progress.c
+++ b/resize/sim_progress.c
@@ -5,7 +5,7 @@
* PowerQuest, Inc.
*
* Copyright (C) 1999, 2000 by Theosore Ts'o
- *
+ *
* %Begin-Header%
* This file may be redistributed under the terms of the GNU Public
* License.
@@ -58,7 +58,7 @@
num = level - old_level;
if (num == 0)
return;
-
+
if (num > 0) {
for (i=0; i < num; i++)
putc('X', prog->f);
@@ -100,7 +100,7 @@
prog->current = 0;
prog->shown = 0;
prog->f = stdout;
-
+
*ret_prog = prog;
return ext2fs_progress_display(prog);
diff --git a/resize/test_extent.c b/resize/test_extent.c
index 6a3f49d..887b476 100644
--- a/resize/test_extent.c
+++ b/resize/test_extent.c
@@ -5,7 +5,7 @@
* PowerQuest, Inc.
*
* Copyright (C) 1999, 2000 by Theosore Ts'o
- *
+ *
* %Begin-Header%
* This file may be redistributed under the terms of the GNU Public
* License.
@@ -25,7 +25,7 @@
errcode_t retval;
ext2_extent extent = 0;
const char *no_table = "# No extent table\n";
-
+
while (!feof(in)) {
if (!fgets(buf, sizeof(buf), in))
break;
@@ -55,7 +55,7 @@
*cp++ = '\0';
arg1 = cp;
num1 = strtoul(arg1, 0, 0);
-
+
cp = strchr(cp, ' ');
}
if (cp) {
@@ -63,7 +63,7 @@
arg2 = cp;
num2 = strtoul(arg2, 0, 0);
}
-
+
if (!strcmp(cmd, "create")) {
retval = ext2fs_create_extent_table(&extent, num1);
if (retval) {
@@ -77,7 +77,7 @@
if (!extent) {
fputs(no_table, out);
continue;
- }
+ }
if (!strcmp(cmd, "free")) {
ext2fs_free_extent_table(extent);
extent = 0;
@@ -105,7 +105,7 @@
fprintf(out, "# %u -> %u (%d)\n",
num1, num2, size);
}
- } else
+ } else
fputs("# Syntax error\n", out);
}
}