diff options
| author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2008-07-21 13:33:22 +0000 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2008-07-21 13:33:22 +0000 |
| commit | e1e5174942d4624e3abb8b98fe404afdbb4edad1 (patch) | |
| tree | 90df2597a9ee281f4fe0aee8cfacf037e6123397 /util-linux/mkfs_minix.c | |
| parent | 525936195718b40ddb29f30fa87c15c1533c1d08 (diff) | |
| download | busybox-w32-e1e5174942d4624e3abb8b98fe404afdbb4edad1.tar.gz busybox-w32-e1e5174942d4624e3abb8b98fe404afdbb4edad1.tar.bz2 busybox-w32-e1e5174942d4624e3abb8b98fe404afdbb4edad1.zip | |
- s/super.block/superblock/g; # for consistency; -1b
Diffstat (limited to 'util-linux/mkfs_minix.c')
| -rw-r--r-- | util-linux/mkfs_minix.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/util-linux/mkfs_minix.c b/util-linux/mkfs_minix.c index ceeb72a2b..8c3991a99 100644 --- a/util-linux/mkfs_minix.c +++ b/util-linux/mkfs_minix.c | |||
| @@ -109,7 +109,7 @@ struct globals { | |||
| 109 | unsigned currently_testing; | 109 | unsigned currently_testing; |
| 110 | 110 | ||
| 111 | char root_block[BLOCK_SIZE]; | 111 | char root_block[BLOCK_SIZE]; |
| 112 | char super_block_buffer[BLOCK_SIZE]; | 112 | char superblock_buffer[BLOCK_SIZE]; |
| 113 | char boot_block_buffer[512]; | 113 | char boot_block_buffer[512]; |
| 114 | unsigned short good_blocks_table[MAX_GOOD_BLOCKS]; | 114 | unsigned short good_blocks_table[MAX_GOOD_BLOCKS]; |
| 115 | /* check_blocks(): buffer[] was the biggest static in entire bbox */ | 115 | /* check_blocks(): buffer[] was the biggest static in entire bbox */ |
| @@ -133,7 +133,7 @@ static ALWAYS_INLINE unsigned div_roundup(unsigned size, unsigned n) | |||
| 133 | #define INODE_BUF1 (((struct minix1_inode*)G.inode_buffer) - 1) | 133 | #define INODE_BUF1 (((struct minix1_inode*)G.inode_buffer) - 1) |
| 134 | #define INODE_BUF2 (((struct minix2_inode*)G.inode_buffer) - 1) | 134 | #define INODE_BUF2 (((struct minix2_inode*)G.inode_buffer) - 1) |
| 135 | 135 | ||
| 136 | #define SB (*(struct minix_super_block*)G.super_block_buffer) | 136 | #define SB (*(struct minix_superblock*)G.superblock_buffer) |
| 137 | 137 | ||
| 138 | #define SB_INODES (SB.s_ninodes) | 138 | #define SB_INODES (SB.s_ninodes) |
| 139 | #define SB_IMAPS (SB.s_imap_blocks) | 139 | #define SB_IMAPS (SB.s_imap_blocks) |
| @@ -235,7 +235,7 @@ static int get_size(const char *file) | |||
| 235 | 235 | ||
| 236 | static void write_tables(void) | 236 | static void write_tables(void) |
| 237 | { | 237 | { |
| 238 | /* Mark the super block valid. */ | 238 | /* Mark the superblock valid. */ |
| 239 | SB.s_state |= MINIX_VALID_FS; | 239 | SB.s_state |= MINIX_VALID_FS; |
| 240 | SB.s_state &= ~MINIX_ERROR_FS; | 240 | SB.s_state &= ~MINIX_ERROR_FS; |
| 241 | 241 | ||
| @@ -249,7 +249,7 @@ static void write_tables(void) | |||
| 249 | xlseek(dev_fd, BLOCK_SIZE, SEEK_SET); | 249 | xlseek(dev_fd, BLOCK_SIZE, SEEK_SET); |
| 250 | 250 | ||
| 251 | msg_eol = "cannot write superblock"; | 251 | msg_eol = "cannot write superblock"; |
| 252 | xwrite(dev_fd, G.super_block_buffer, BLOCK_SIZE); | 252 | xwrite(dev_fd, G.superblock_buffer, BLOCK_SIZE); |
| 253 | 253 | ||
| 254 | msg_eol = "cannot write inode map"; | 254 | msg_eol = "cannot write inode map"; |
| 255 | xwrite(dev_fd, G.inode_map, SB_IMAPS * BLOCK_SIZE); | 255 | xwrite(dev_fd, G.inode_map, SB_IMAPS * BLOCK_SIZE); |
| @@ -556,7 +556,7 @@ static void setup_tables(void) | |||
| 556 | unsigned sb_zmaps; | 556 | unsigned sb_zmaps; |
| 557 | unsigned i; | 557 | unsigned i; |
| 558 | 558 | ||
| 559 | /* memset(G.super_block_buffer, 0, BLOCK_SIZE); */ | 559 | /* memset(G.superblock_buffer, 0, BLOCK_SIZE); */ |
| 560 | /* memset(G.boot_block_buffer, 0, 512); */ | 560 | /* memset(G.boot_block_buffer, 0, 512); */ |
| 561 | SB_MAGIC = G.magic; | 561 | SB_MAGIC = G.magic; |
| 562 | SB_ZONE_SIZE = 0; | 562 | SB_ZONE_SIZE = 0; |