korg/e2fsprogs
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git synced 2024-12-16 05:15:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
4d003982f9
e2fsprogs/resize/resize2fs.h

125 lines
2.8 KiB
C
Raw Normal View History

ChangeLog, Makefile.in, configure.in: configure.in (rmakefile): Added (optional) private directory for resize2fs. Makefile.in: Change recursive descent rules to check to see if a directory exists before trying to make it. Many files: Initial checkin of work done to date.
1997-06-08 04:42:58 +08:00
/*
* resize2fs.h --- ext2 resizer header file
*
* Copyright (C) 1997 Theodore Ts'o
*
* %Begin-Header%
* All rights reserved.
* %End-Header%
*/
#include <stdio.h>
#include <string.h>
ChangeLog, mk_cmds.sh.in: mk_cmds.sh.in: Fix error message so that it says mk_cmds's template files instead of compile_et's template files. ChangeLog, resize2fs.h: resize2fs.h: Protect include of unistd.h with HAVE_UNISTD_H. e2fsprogs.lsm: Updated for 1.12 release.
1998-08-01 12:33:31 +08:00
#ifdef HAVE_UNISTD_H
ChangeLog, Makefile.in, configure.in: configure.in (rmakefile): Added (optional) private directory for resize2fs. Makefile.in: Change recursive descent rules to check to see if a directory exists before trying to make it. Many files: Initial checkin of work done to date.
1997-06-08 04:42:58 +08:00
#include <unistd.h>
ChangeLog, mk_cmds.sh.in: mk_cmds.sh.in: Fix error message so that it says mk_cmds's template files instead of compile_et's template files. ChangeLog, resize2fs.h: resize2fs.h: Protect include of unistd.h with HAVE_UNISTD_H. e2fsprogs.lsm: Updated for 1.12 release.
1998-08-01 12:33:31 +08:00
#endif
ChangeLog, Makefile.in, configure.in: configure.in (rmakefile): Added (optional) private directory for resize2fs. Makefile.in: Change recursive descent rules to check to see if a directory exists before trying to make it. Many files: Initial checkin of work done to date.
1997-06-08 04:42:58 +08:00
#include <stdlib.h>
Many files: Rename io.h to be ext2_io.h (avoid namespace collisions) ChangeLog, resize2fs.h: Add #ifdef's for HAVE_SYS_TYPES_H and HAVE_SYS_TIME_H.
1997-10-20 08:44:26 +08:00
#ifdef HAVE_SYS_TYPES_H
ChangeLog, Makefile.in, configure.in: configure.in (rmakefile): Added (optional) private directory for resize2fs. Makefile.in: Change recursive descent rules to check to see if a directory exists before trying to make it. Many files: Initial checkin of work done to date.
1997-06-08 04:42:58 +08:00
#include <sys/types.h>
Many files: Rename io.h to be ext2_io.h (avoid namespace collisions) ChangeLog, resize2fs.h: Add #ifdef's for HAVE_SYS_TYPES_H and HAVE_SYS_TIME_H.
1997-10-20 08:44:26 +08:00
#endif
#ifdef HAVE_SYS_TIME_H
ChangeLog, Makefile.in, configure.in: configure.in (rmakefile): Added (optional) private directory for resize2fs. Makefile.in: Change recursive descent rules to check to see if a directory exists before trying to make it. Many files: Initial checkin of work done to date.
1997-06-08 04:42:58 +08:00
#include <sys/time.h>
Many files: Rename io.h to be ext2_io.h (avoid namespace collisions) ChangeLog, resize2fs.h: Add #ifdef's for HAVE_SYS_TYPES_H and HAVE_SYS_TIME_H.
1997-10-20 08:44:26 +08:00
#endif
ChangeLog, bmove.c, llseek.c: llseek.c: Added missing semicolon to glibc fixup declaration of llseek(). bmove.c: Add #include of errno.h ChangeLog, resize2fs.h: Add #include for errno.h
1997-09-04 08:43:10 +08:00
#if HAVE_ERRNO_H
#include <errno.h>
#endif
ChangeLog, Makefile.in, configure.in: configure.in (rmakefile): Added (optional) private directory for resize2fs. Makefile.in: Change recursive descent rules to check to see if a directory exists before trying to make it. Many files: Initial checkin of work done to date.
1997-06-08 04:42:58 +08:00
Many files: resize2fs.h: If EXT2_FLAT_INCLUDES is defined, then assume all of the ext2-specific header files are in a flat directory. ext2_block_move.c, ext2_inode_move.c, extent.c, resize2fs.c, resize2fs.h: Rename variables named "new" to "new_block", "new_inode", or "new_loc" to avoid C++ reserved word clash. ext2_block_move.c, ext2_inode_move.c, extent.c, resize2fs.c, sim_progress.c: Use ext2fs_get_memory(), ext2fs_free_memory(), et. al., instead of malloc() and free(). ext2_block_move.c, ext2_inode_move.c, extent.c: Explicitly cast all assignments from void * to be compatible with C++. banalysis.c, banalysis.h, ext2_inode_move.c, ext2_block_move.c: Change private to priv_data to avoid C++ namespace clash. ChangeLog, badblocks.8.in: badblocks.8.in: Add documentation for the -s option.
1998-01-19 22:55:24 +08:00
#if EXT2_FLAT_INCLUDES
#include "ext2_fs.h"
#include "ext2fs.h"
#else
#include <linux/ext2_fs.h>
ChangeLog, Makefile.in, configure.in: configure.in (rmakefile): Added (optional) private directory for resize2fs. Makefile.in: Change recursive descent rules to check to see if a directory exists before trying to make it. Many files: Initial checkin of work done to date.
1997-06-08 04:42:58 +08:00
#include "ext2fs/ext2fs.h"
Many files: resize2fs.h: If EXT2_FLAT_INCLUDES is defined, then assume all of the ext2-specific header files are in a flat directory. ext2_block_move.c, ext2_inode_move.c, extent.c, resize2fs.c, resize2fs.h: Rename variables named "new" to "new_block", "new_inode", or "new_loc" to avoid C++ reserved word clash. ext2_block_move.c, ext2_inode_move.c, extent.c, resize2fs.c, sim_progress.c: Use ext2fs_get_memory(), ext2fs_free_memory(), et. al., instead of malloc() and free(). ext2_block_move.c, ext2_inode_move.c, extent.c: Explicitly cast all assignments from void * to be compatible with C++. banalysis.c, banalysis.h, ext2_inode_move.c, ext2_block_move.c: Change private to priv_data to avoid C++ namespace clash. ChangeLog, badblocks.8.in: badblocks.8.in: Add documentation for the -s option.
1998-01-19 22:55:24 +08:00
#endif
ChangeLog, Makefile.in, configure.in: configure.in (rmakefile): Added (optional) private directory for resize2fs. Makefile.in: Change recursive descent rules to check to see if a directory exists before trying to make it. Many files: Initial checkin of work done to date.
1997-06-08 04:42:58 +08:00
Many files: Checkin of work to date. (Pretty much completely working now.)
1997-06-17 11:52:12 +08:00
/*
* For the extent map
*/
typedef struct _ext2_extent *ext2_extent;
/*
* For the simple progress meter
*/
typedef struct ext2_sim_progress *ext2_sim_progmeter;
ChangeLog, Makefile.in, version.h: Allow people to set the version.h to something like 1.10-PLUS. .del-inodemap.c~24510e64, main.c, resize2fs.c, resize2fs.h: More interim work. All is functioning except progress meter.
1997-06-14 15:28:44 +08:00
/*
* Flags for the resizer; most are debugging flags only
*/
#define RESIZE_DEBUG_IO 0x0001
#define RESIZE_DEBUG_BMOVE 0x0002
#define RESIZE_DEBUG_INODEMAP 0x0004
#define RESIZE_DEBUG_ITABLEMOVE 0x0008
#define RESIZE_PERCENT_COMPLETE 0x0100
Many files: Checkin of work to date. (Pretty much completely working now.)
1997-06-17 11:52:12 +08:00
#define RESIZE_VERBOSE 0x0200
ChangeLog, Makefile.in, version.h: Allow people to set the version.h to something like 1.10-PLUS. .del-inodemap.c~24510e64, main.c, resize2fs.c, resize2fs.h: More interim work. All is functioning except progress meter.
1997-06-14 15:28:44 +08:00
ChangeLog, Makefile.in, configure.in: configure.in (rmakefile): Added (optional) private directory for resize2fs. Makefile.in: Change recursive descent rules to check to see if a directory exists before trying to make it. Many files: Initial checkin of work done to date.
1997-06-08 04:42:58 +08:00
/*
* The core state structure for the ext2 resizer
*/
Many files: resize2fs.c, resize2fs.h, ext2_block_move.c, ext2_inode_move.c, main.c: Reorganize how the progress functions are called.
1998-02-14 06:58:18 +08:00
typedef struct ext2_resize_struct *ext2_resize_t;
ChangeLog, Makefile.in, configure.in: configure.in (rmakefile): Added (optional) private directory for resize2fs. Makefile.in: Change recursive descent rules to check to see if a directory exists before trying to make it. Many files: Initial checkin of work done to date.
1997-06-08 04:42:58 +08:00
struct ext2_resize_struct {
ext2_filsys old_fs;
ext2_filsys new_fs;
Many files: bmove.c (ext2fs_move_blocks): New function which takes a bitmap of blocks which need to be moved, and moves those blocks to another location in the filesystem. rs_bitmap.c (ext2fs_resize_generic_bitmap): When expanding a bitmap, make sure all of the new parts of the bitmap are zero. bitmaps.c (ext2fs_copy_bitmap): Fix bug; the destination bitmap wasn't being returned to the caller. alloc_tables.c (ext2fs_allocate_group_table): Add new function ext2fs_allocate_group_table() which sets the group tables for a particular block group. The relevant code was factored out of ext2fs_allocate_tables(). dblist.c (make_dblist): Adjust the initial size of the directory block list to be a bit more realize (ten plus twice the number of directories in the filesystem). Check in interim work.
1997-06-09 22:51:29 +08:00
ext2fs_block_bitmap reserve_blocks;
Many files: Checkin of work to date. (Pretty much completely working now.)
1997-06-17 11:52:12 +08:00
ext2fs_block_bitmap move_blocks;
Many files: Major reoganization of how resizing works. Functions in ext2_block_move.c, and ext2_inode_move.c moved into resize2fs.c. Multiple passes in those two files also combined into a single inode scanning pass. Made the inode table moving function better handling the case where it needs to abort mid-operation. When moving blocks around, made the block allocation function preferentially avoid the old group descriptor blocks, to make resize2fs more robust.
1998-02-17 06:16:20 +08:00
ext2_extent bmap;
ext2_extent imap;
Many files: bmove.c (ext2fs_move_blocks): New function which takes a bitmap of blocks which need to be moved, and moves those blocks to another location in the filesystem. rs_bitmap.c (ext2fs_resize_generic_bitmap): When expanding a bitmap, make sure all of the new parts of the bitmap are zero. bitmaps.c (ext2fs_copy_bitmap): Fix bug; the destination bitmap wasn't being returned to the caller. alloc_tables.c (ext2fs_allocate_group_table): Add new function ext2fs_allocate_group_table() which sets the group tables for a particular block group. The relevant code was factored out of ext2fs_allocate_tables(). dblist.c (make_dblist): Adjust the initial size of the directory block list to be a bit more realize (ten plus twice the number of directories in the filesystem). Check in interim work.
1997-06-09 22:51:29 +08:00
int needed_blocks;
ChangeLog, Makefile.in, version.h: Allow people to set the version.h to something like 1.10-PLUS. .del-inodemap.c~24510e64, main.c, resize2fs.c, resize2fs.h: More interim work. All is functioning except progress meter.
1997-06-14 15:28:44 +08:00
int flags;
char *itable_buf;
Many files: Major reoganization of how resizing works. Functions in ext2_block_move.c, and ext2_inode_move.c moved into resize2fs.c. Multiple passes in those two files also combined into a single inode scanning pass. Made the inode table moving function better handling the case where it needs to abort mid-operation. When moving blocks around, made the block allocation function preferentially avoid the old group descriptor blocks, to make resize2fs more robust.
1998-02-17 06:16:20 +08:00
/*
* For the block allocator
*/
blk_t new_blk;
int alloc_state;
/*
* For the progress meter
*/
ChangeLog, main.c, resize2fs.c, resize2fs.h: Change the progress function to return an errcode_t; this allows the progress function to return a error indicating a user-requested cancel.
1998-02-25 04:24:49 +08:00
errcode_t (*progress)(ext2_resize_t rfs, int pass,
Many files: resize2fs.c, resize2fs.h, ext2_block_move.c, ext2_inode_move.c, main.c: Reorganize how the progress functions are called.
1998-02-14 06:58:18 +08:00
unsigned long cur,
unsigned long max);
void *prog_data;
ChangeLog, Makefile.in, configure.in: configure.in (rmakefile): Added (optional) private directory for resize2fs. Makefile.in: Change recursive descent rules to check to see if a directory exists before trying to make it. Many files: Initial checkin of work done to date.
1997-06-08 04:42:58 +08:00
};
Many files: resize2fs.c, resize2fs.h, ext2_block_move.c, ext2_inode_move.c, main.c: Reorganize how the progress functions are called.
1998-02-14 06:58:18 +08:00
/*
* Progress pass numbers...
*/
Many files: Major reoganization of how resizing works. Functions in ext2_block_move.c, and ext2_inode_move.c moved into resize2fs.c. Multiple passes in those two files also combined into a single inode scanning pass. Made the inode table moving function better handling the case where it needs to abort mid-operation. When moving blocks around, made the block allocation function preferentially avoid the old group descriptor blocks, to make resize2fs more robust.
1998-02-17 06:16:20 +08:00
#define E2_RSZ_EXTEND_ITABLE_PASS 1
Many files: resize2fs.c, resize2fs.h, ext2_block_move.c, ext2_inode_move.c, main.c: Reorganize how the progress functions are called.
1998-02-14 06:58:18 +08:00
#define E2_RSZ_BLOCK_RELOC_PASS 2
Many files: Major reoganization of how resizing works. Functions in ext2_block_move.c, and ext2_inode_move.c moved into resize2fs.c. Multiple passes in those two files also combined into a single inode scanning pass. Made the inode table moving function better handling the case where it needs to abort mid-operation. When moving blocks around, made the block allocation function preferentially avoid the old group descriptor blocks, to make resize2fs more robust.
1998-02-17 06:16:20 +08:00
#define E2_RSZ_INODE_SCAN_PASS 3
#define E2_RSZ_INODE_REF_UPD_PASS 4
#define E2_RSZ_MOVE_ITABLE_PASS 5
Many files: resize2fs.c, resize2fs.h, ext2_block_move.c, ext2_inode_move.c, main.c: Reorganize how the progress functions are called.
1998-02-14 06:58:18 +08:00
ChangeLog, Makefile.in, configure.in: configure.in (rmakefile): Added (optional) private directory for resize2fs. Makefile.in: Change recursive descent rules to check to see if a directory exists before trying to make it. Many files: Initial checkin of work done to date.
1997-06-08 04:42:58 +08:00
/* prototypes */
Many files: resize2fs.c, resize2fs.h, ext2_block_move.c, ext2_inode_move.c, main.c: Reorganize how the progress functions are called.
1998-02-14 06:58:18 +08:00
extern errcode_t resize_fs(ext2_filsys fs, blk_t new_size, int flags,
ChangeLog, main.c, resize2fs.c, resize2fs.h: Change the progress function to return an errcode_t; this allows the progress function to return a error indicating a user-requested cancel.
1998-02-25 04:24:49 +08:00
errcode_t (*progress)(ext2_resize_t rfs,
int pass, unsigned long cur,
Many files: resize2fs.c, resize2fs.h, ext2_block_move.c, ext2_inode_move.c, main.c: Reorganize how the progress functions are called.
1998-02-14 06:58:18 +08:00
unsigned long max));
Many files: Checkin of work to date. (Pretty much completely working now.)
1997-06-17 11:52:12 +08:00
/* extent.c */
extern errcode_t ext2fs_create_extent_table(ext2_extent *ret_extent,
int size);
extern void ext2fs_free_extent_table(ext2_extent extent);
extern errcode_t ext2fs_add_extent_entry(ext2_extent extent,
Many files: resize2fs.h: If EXT2_FLAT_INCLUDES is defined, then assume all of the ext2-specific header files are in a flat directory. ext2_block_move.c, ext2_inode_move.c, extent.c, resize2fs.c, resize2fs.h: Rename variables named "new" to "new_block", "new_inode", or "new_loc" to avoid C++ reserved word clash. ext2_block_move.c, ext2_inode_move.c, extent.c, resize2fs.c, sim_progress.c: Use ext2fs_get_memory(), ext2fs_free_memory(), et. al., instead of malloc() and free(). ext2_block_move.c, ext2_inode_move.c, extent.c: Explicitly cast all assignments from void * to be compatible with C++. banalysis.c, banalysis.h, ext2_inode_move.c, ext2_block_move.c: Change private to priv_data to avoid C++ namespace clash. ChangeLog, badblocks.8.in: badblocks.8.in: Add documentation for the -s option.
1998-01-19 22:55:24 +08:00
__u32 old_loc, __u32 new_loc);
extern __u32 ext2fs_extent_translate(ext2_extent extent, __u32 old_loc);
Many files: Checkin of work to date. (Pretty much completely working now.)
1997-06-17 11:52:12 +08:00
extern void ext2fs_extent_dump(ext2_extent extent, FILE *out);
Many files: resize2fs.h: If EXT2_FLAT_INCLUDES is defined, then assume all of the ext2-specific header files are in a flat directory. ext2_block_move.c, ext2_inode_move.c, extent.c, resize2fs.c, resize2fs.h: Rename variables named "new" to "new_block", "new_inode", or "new_loc" to avoid C++ reserved word clash. ext2_block_move.c, ext2_inode_move.c, extent.c, resize2fs.c, sim_progress.c: Use ext2fs_get_memory(), ext2fs_free_memory(), et. al., instead of malloc() and free(). ext2_block_move.c, ext2_inode_move.c, extent.c: Explicitly cast all assignments from void * to be compatible with C++. banalysis.c, banalysis.h, ext2_inode_move.c, ext2_block_move.c: Change private to priv_data to avoid C++ namespace clash. ChangeLog, badblocks.8.in: badblocks.8.in: Add documentation for the -s option.
1998-01-19 22:55:24 +08:00
extern errcode_t ext2fs_iterate_extent(ext2_extent extent, __u32 *old_loc,
__u32 *new_loc, int *size);
Many files: Checkin of work to date. (Pretty much completely working now.)
1997-06-17 11:52:12 +08:00
/* sim_progress.c */
extern errcode_t ext2fs_progress_init(ext2_sim_progmeter *ret_prog,
const char *label,
int labelwidth, int barwidth,
__u32 maxdone, int flags);
extern void ext2fs_progress_update(ext2_sim_progmeter prog,
__u32 current);
extern void ext2fs_progress_close(ext2_sim_progmeter prog);
Reference in New Issue Copy Permalink