From 4f34f0aa4d4f0874a6dbcafe8e43cc8ef2182092 Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Wed, 18 Apr 2007 21:41:38 -0400 Subject: And more mke2fs changes. --- toys/toylist.h | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/toys/toylist.h b/toys/toylist.h index cb239b42..b2122153 100644 --- a/toys/toylist.h +++ b/toys/toylist.h @@ -19,16 +19,30 @@ struct df_data { }; struct mke2fs_data { + // Command line arguments. long blocksize; long bytes_per_inode; - long inodespg; - long reserved_percent; - char *gendir; + long inodes; // Total inodes in filesystem. + long reserved_percent; // Integer precent of space to reserve for root. + char *gendir; // Where to read dirtree from. + + // Internal data. + struct dirtree *dt; // Tree of files to copy into the new filesystem. + unsigned treeblocks; // Blocks used by dt + unsigned treeinodes; // Inodes used by dt + + unsigned blocks; // Total blocks in the filesystem. + unsigned freeblocks; // Free blocks in the filesystem. + unsigned inodespg; // Inodes per group + unsigned groups; // Total number of block groups. + unsigned blockbits; // Bits per block. (Also blocks per group.) + + // For gene2fs + unsigned nextblock; // Next data block to allocate + unsigned nextgroup; // Next group we'll be allocating from + int fsfd; // File descriptor of filesystem (to output to). - unsigned blocks, groups, blockbits, treeblocks, treeinodes; - int fsfd, noseek; struct ext2_superblock sb; - struct dirtree *dt; }; struct touch_data { -- cgit v1.2.3