annotate toys/mke2fs.c @ 233:d4176f3f3835

Zap toys/Config.in and instead create generated/Config.in from contents of toys/*.c. Move relevant info into comment at the top of each toys/*.c. Also convert more of Makefile into a thin wrapper around shell scripts that actually do the work. (Makefile is only still there for the user interface.)
author Rob Landley <rob@landley.net>
date Sat, 19 Jan 2008 17:08:39 -0600
parents 30a6db5a95c2
children 163498bf547b
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
53
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on.
Rob Landley <rob@landley.net>
parents:
diff changeset
1 /* vi: set ts=4:
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on.
Rob Landley <rob@landley.net>
parents:
diff changeset
2 *
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on.
Rob Landley <rob@landley.net>
parents:
diff changeset
3 * mke2fs.c - Create an ext2 filesystem image.
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on.
Rob Landley <rob@landley.net>
parents:
diff changeset
4 *
194
30a6db5a95c2 Add comments about SUSv3 specs (or lack thereof).
Rob Landley <rob@landley.net>
parents: 186
diff changeset
5 * Copyright 2006, 2007 Rob Landley <rob@landley.net>
30a6db5a95c2 Add comments about SUSv3 specs (or lack thereof).
Rob Landley <rob@landley.net>
parents: 186
diff changeset
6 *
30a6db5a95c2 Add comments about SUSv3 specs (or lack thereof).
Rob Landley <rob@landley.net>
parents: 186
diff changeset
7 * Not in SUSv3.
233
d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of
Rob Landley <rob@landley.net>
parents: 194
diff changeset
8
d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of
Rob Landley <rob@landley.net>
parents: 194
diff changeset
9 config MKE2FS
d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of
Rob Landley <rob@landley.net>
parents: 194
diff changeset
10 bool "mke2fs"
d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of
Rob Landley <rob@landley.net>
parents: 194
diff changeset
11 default n
d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of
Rob Landley <rob@landley.net>
parents: 194
diff changeset
12 help
d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of
Rob Landley <rob@landley.net>
parents: 194
diff changeset
13 usage: mke2fs [-Fnq] [-b ###] [-N|i ###] [-m ###] device
d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of
Rob Landley <rob@landley.net>
parents: 194
diff changeset
14
d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of
Rob Landley <rob@landley.net>
parents: 194
diff changeset
15 Create an ext2 filesystem on a block device or filesystem image.
d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of
Rob Landley <rob@landley.net>
parents: 194
diff changeset
16
d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of
Rob Landley <rob@landley.net>
parents: 194
diff changeset
17 -F Force to run on a mounted device
d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of
Rob Landley <rob@landley.net>
parents: 194
diff changeset
18 -n Don't write to device
d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of
Rob Landley <rob@landley.net>
parents: 194
diff changeset
19 -q Quiet (no output)
d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of
Rob Landley <rob@landley.net>
parents: 194
diff changeset
20 -b size Block size (1024, 2048, or 4096)
d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of
Rob Landley <rob@landley.net>
parents: 194
diff changeset
21 -N inodes Allocate this many inodes
d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of
Rob Landley <rob@landley.net>
parents: 194
diff changeset
22 -i bytes Allocate one inode for every XXX bytes of device
d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of
Rob Landley <rob@landley.net>
parents: 194
diff changeset
23 -m percent Reserve this percent of filesystem space for root user
d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of
Rob Landley <rob@landley.net>
parents: 194
diff changeset
24
d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of
Rob Landley <rob@landley.net>
parents: 194
diff changeset
25 config MKE2FS_JOURNAL
d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of
Rob Landley <rob@landley.net>
parents: 194
diff changeset
26 bool "Journaling support (ext3)"
d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of
Rob Landley <rob@landley.net>
parents: 194
diff changeset
27 default n
d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of
Rob Landley <rob@landley.net>
parents: 194
diff changeset
28 depends on MKE2FS
d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of
Rob Landley <rob@landley.net>
parents: 194
diff changeset
29 help
d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of
Rob Landley <rob@landley.net>
parents: 194
diff changeset
30 usage: [-j] [-J size=###,device=XXX]
d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of
Rob Landley <rob@landley.net>
parents: 194
diff changeset
31
d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of
Rob Landley <rob@landley.net>
parents: 194
diff changeset
32 -j Create journal (ext3)
d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of
Rob Landley <rob@landley.net>
parents: 194
diff changeset
33 -J Journal options
d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of
Rob Landley <rob@landley.net>
parents: 194
diff changeset
34 size: Number of blocks (1024-102400)
d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of
Rob Landley <rob@landley.net>
parents: 194
diff changeset
35 device: Specify an external journal
d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of
Rob Landley <rob@landley.net>
parents: 194
diff changeset
36
d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of
Rob Landley <rob@landley.net>
parents: 194
diff changeset
37 config MKE2FS_GEN
d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of
Rob Landley <rob@landley.net>
parents: 194
diff changeset
38 bool "Generate (gene2fs)"
d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of
Rob Landley <rob@landley.net>
parents: 194
diff changeset
39 default n
d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of
Rob Landley <rob@landley.net>
parents: 194
diff changeset
40 depends on MKE2FS
d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of
Rob Landley <rob@landley.net>
parents: 194
diff changeset
41 help
d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of
Rob Landley <rob@landley.net>
parents: 194
diff changeset
42 usage: gene2fs [options] device filename
d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of
Rob Landley <rob@landley.net>
parents: 194
diff changeset
43
d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of
Rob Landley <rob@landley.net>
parents: 194
diff changeset
44 The [options] are the same as mke2fs.
d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of
Rob Landley <rob@landley.net>
parents: 194
diff changeset
45
d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of
Rob Landley <rob@landley.net>
parents: 194
diff changeset
46 config MKE2FS_LABEL
d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of
Rob Landley <rob@landley.net>
parents: 194
diff changeset
47 bool "Label support"
d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of
Rob Landley <rob@landley.net>
parents: 194
diff changeset
48 default n
d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of
Rob Landley <rob@landley.net>
parents: 194
diff changeset
49 depends on MKE2FS
d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of
Rob Landley <rob@landley.net>
parents: 194
diff changeset
50 help
d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of
Rob Landley <rob@landley.net>
parents: 194
diff changeset
51 usage: mke2fs [-L label] [-M path] [-o string]
d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of
Rob Landley <rob@landley.net>
parents: 194
diff changeset
52
d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of
Rob Landley <rob@landley.net>
parents: 194
diff changeset
53 -L Volume label
d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of
Rob Landley <rob@landley.net>
parents: 194
diff changeset
54 -M Path to mount point
d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of
Rob Landley <rob@landley.net>
parents: 194
diff changeset
55 -o Created by
d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of
Rob Landley <rob@landley.net>
parents: 194
diff changeset
56
d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of
Rob Landley <rob@landley.net>
parents: 194
diff changeset
57 config MKE2FS_EXTENDED
d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of
Rob Landley <rob@landley.net>
parents: 194
diff changeset
58 bool "Extended options"
d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of
Rob Landley <rob@landley.net>
parents: 194
diff changeset
59 default n
d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of
Rob Landley <rob@landley.net>
parents: 194
diff changeset
60 depends on MKE2FS
d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of
Rob Landley <rob@landley.net>
parents: 194
diff changeset
61 help
d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of
Rob Landley <rob@landley.net>
parents: 194
diff changeset
62 usage: mke2fs [-E stride=###] [-O option[,option]]
d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of
Rob Landley <rob@landley.net>
parents: 194
diff changeset
63
d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of
Rob Landley <rob@landley.net>
parents: 194
diff changeset
64 -E stride= Set RAID stripe size (in blocks)
d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of
Rob Landley <rob@landley.net>
parents: 194
diff changeset
65 -O [opts] Specify fewer ext2 option flags (for old kernels)
d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of
Rob Landley <rob@landley.net>
parents: 194
diff changeset
66 All of these are on by default (as appropriate)
d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of
Rob Landley <rob@landley.net>
parents: 194
diff changeset
67 none Clear default options (all but journaling)
d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of
Rob Landley <rob@landley.net>
parents: 194
diff changeset
68 dir_index Use htree indexes for large directories
d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of
Rob Landley <rob@landley.net>
parents: 194
diff changeset
69 filetype Store file type info in directory entry
d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of
Rob Landley <rob@landley.net>
parents: 194
diff changeset
70 has_journal Set by -j
d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of
Rob Landley <rob@landley.net>
parents: 194
diff changeset
71 journal_dev Set by -J device=XXX
d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of
Rob Landley <rob@landley.net>
parents: 194
diff changeset
72 sparse_super Don't allocate huge numbers of redundant superblocks
d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of
Rob Landley <rob@landley.net>
parents: 194
diff changeset
73 */
53
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on.
Rob Landley <rob@landley.net>
parents:
diff changeset
74
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on.
Rob Landley <rob@landley.net>
parents:
diff changeset
75 #include "toys.h"
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on.
Rob Landley <rob@landley.net>
parents:
diff changeset
76
143
9cbb323f297f Break out dirtree.c and let it call a function instead of returning the data.
Rob Landley <rob@landley.net>
parents: 112
diff changeset
77 // Shortcut to our global data structure, since we use it so much.
76
e6332139adae More work on mke2fs.
Rob Landley <rob@landley.net>
parents: 75
diff changeset
78 #define TT toy.mke2fs
e6332139adae More work on mke2fs.
Rob Landley <rob@landley.net>
parents: 75
diff changeset
79
112
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
80 #define INODES_RESERVED 10
53
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on.
Rob Landley <rob@landley.net>
parents:
diff changeset
81
112
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
82 static uint32_t div_round_up(uint32_t a, uint32_t b)
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
83 {
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
84 uint32_t c = a/b;
53
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on.
Rob Landley <rob@landley.net>
parents:
diff changeset
85
112
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
86 if (a%b) c++;
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
87 return c;
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
88 }
53
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on.
Rob Landley <rob@landley.net>
parents:
diff changeset
89
97
4c81e6375719 Add parent pointer to dirtree, more work on mke2fs (populate dirtree, count
Rob Landley <rob@landley.net>
parents: 84
diff changeset
90 // Calculate data blocks plus index blocks needed to hold a file.
99
97d717829ff0 More work on mke2fs.c. Random in-progress snapshot...
Rob Landley <rob@landley.net>
parents: 97
diff changeset
91
112
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
92 static uint32_t file_blocks_used(uint64_t size, uint32_t *blocklist)
97
4c81e6375719 Add parent pointer to dirtree, more work on mke2fs (populate dirtree, count
Rob Landley <rob@landley.net>
parents: 84
diff changeset
93 {
4c81e6375719 Add parent pointer to dirtree, more work on mke2fs (populate dirtree, count
Rob Landley <rob@landley.net>
parents: 84
diff changeset
94 uint32_t dblocks = (uint32_t)((size+(TT.blocksize-1))/TT.blocksize);
4c81e6375719 Add parent pointer to dirtree, more work on mke2fs (populate dirtree, count
Rob Landley <rob@landley.net>
parents: 84
diff changeset
95 uint32_t idx=TT.blocksize/4, iblocks=0, diblocks=0, tiblocks=0;
4c81e6375719 Add parent pointer to dirtree, more work on mke2fs (populate dirtree, count
Rob Landley <rob@landley.net>
parents: 84
diff changeset
96
143
9cbb323f297f Break out dirtree.c and let it call a function instead of returning the data.
Rob Landley <rob@landley.net>
parents: 112
diff changeset
97 // Fill out index blocks in inode.
112
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
98
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
99 if (blocklist) {
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
100 int i;
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
101
143
9cbb323f297f Break out dirtree.c and let it call a function instead of returning the data.
Rob Landley <rob@landley.net>
parents: 112
diff changeset
102 // Direct index blocks
112
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
103 for (i=0; i<13 && i<dblocks; i++) blocklist[i] = i;
143
9cbb323f297f Break out dirtree.c and let it call a function instead of returning the data.
Rob Landley <rob@landley.net>
parents: 112
diff changeset
104 // Singly indirect index blocks
112
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
105 if (dblocks > 13+idx) blocklist[13] = 13+idx;
143
9cbb323f297f Break out dirtree.c and let it call a function instead of returning the data.
Rob Landley <rob@landley.net>
parents: 112
diff changeset
106 // Doubly indirect index blocks
112
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
107 idx = 13 + idx + (idx*idx);
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
108 if (dblocks > idx) blocklist[14] = idx;
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
109
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
110 return 0;
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
111 }
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
112
99
97d717829ff0 More work on mke2fs.c. Random in-progress snapshot...
Rob Landley <rob@landley.net>
parents: 97
diff changeset
113 // Account for direct, singly, doubly, and triply indirect index blocks
97
4c81e6375719 Add parent pointer to dirtree, more work on mke2fs (populate dirtree, count
Rob Landley <rob@landley.net>
parents: 84
diff changeset
114
4c81e6375719 Add parent pointer to dirtree, more work on mke2fs (populate dirtree, count
Rob Landley <rob@landley.net>
parents: 84
diff changeset
115 if (dblocks > 12) {
4c81e6375719 Add parent pointer to dirtree, more work on mke2fs (populate dirtree, count
Rob Landley <rob@landley.net>
parents: 84
diff changeset
116 iblocks = ((dblocks-13)/idx)+1;
4c81e6375719 Add parent pointer to dirtree, more work on mke2fs (populate dirtree, count
Rob Landley <rob@landley.net>
parents: 84
diff changeset
117 if (iblocks > 1) {
4c81e6375719 Add parent pointer to dirtree, more work on mke2fs (populate dirtree, count
Rob Landley <rob@landley.net>
parents: 84
diff changeset
118 diblocks = ((iblocks-2)/idx)+1;
4c81e6375719 Add parent pointer to dirtree, more work on mke2fs (populate dirtree, count
Rob Landley <rob@landley.net>
parents: 84
diff changeset
119 if (diblocks > 1)
4c81e6375719 Add parent pointer to dirtree, more work on mke2fs (populate dirtree, count
Rob Landley <rob@landley.net>
parents: 84
diff changeset
120 tiblocks = ((diblocks-2)/idx)+1;
4c81e6375719 Add parent pointer to dirtree, more work on mke2fs (populate dirtree, count
Rob Landley <rob@landley.net>
parents: 84
diff changeset
121 }
4c81e6375719 Add parent pointer to dirtree, more work on mke2fs (populate dirtree, count
Rob Landley <rob@landley.net>
parents: 84
diff changeset
122 }
99
97d717829ff0 More work on mke2fs.c. Random in-progress snapshot...
Rob Landley <rob@landley.net>
parents: 97
diff changeset
123
97
4c81e6375719 Add parent pointer to dirtree, more work on mke2fs (populate dirtree, count
Rob Landley <rob@landley.net>
parents: 84
diff changeset
124 return dblocks + iblocks + diblocks + tiblocks;
4c81e6375719 Add parent pointer to dirtree, more work on mke2fs (populate dirtree, count
Rob Landley <rob@landley.net>
parents: 84
diff changeset
125 }
4c81e6375719 Add parent pointer to dirtree, more work on mke2fs (populate dirtree, count
Rob Landley <rob@landley.net>
parents: 84
diff changeset
126
112
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
127 // Use the parent pointer to iterate through the tree non-recursively.
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
128 static struct dirtree *treenext(struct dirtree *this)
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
129 {
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
130 while (this && !this->next) this = this->parent;
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
131 if (this) this = this->next;
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
132
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
133 return this;
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
134 }
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
135
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
136 // Recursively calculate the number of blocks used by each inode in the tree.
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
137 // Returns blocks used by this directory, assigns bytes used to *size.
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
138 // Writes total block count to TT.treeblocks and inode count to TT.treeinodes.
99
97d717829ff0 More work on mke2fs.c. Random in-progress snapshot...
Rob Landley <rob@landley.net>
parents: 97
diff changeset
139
104
1c2f6d2e25de Precalculate block and inode usage given a starting file tree. This compiles,
Rob Landley <rob@landley.net>
parents: 101
diff changeset
140 static long check_treesize(struct dirtree *this, off_t *size)
99
97d717829ff0 More work on mke2fs.c. Random in-progress snapshot...
Rob Landley <rob@landley.net>
parents: 97
diff changeset
141 {
97d717829ff0 More work on mke2fs.c. Random in-progress snapshot...
Rob Landley <rob@landley.net>
parents: 97
diff changeset
142 long blocks;
97d717829ff0 More work on mke2fs.c. Random in-progress snapshot...
Rob Landley <rob@landley.net>
parents: 97
diff changeset
143
97d717829ff0 More work on mke2fs.c. Random in-progress snapshot...
Rob Landley <rob@landley.net>
parents: 97
diff changeset
144 while (this) {
97d717829ff0 More work on mke2fs.c. Random in-progress snapshot...
Rob Landley <rob@landley.net>
parents: 97
diff changeset
145 *size += sizeof(struct ext2_dentry) + strlen(this->name);
97d717829ff0 More work on mke2fs.c. Random in-progress snapshot...
Rob Landley <rob@landley.net>
parents: 97
diff changeset
146
97d717829ff0 More work on mke2fs.c. Random in-progress snapshot...
Rob Landley <rob@landley.net>
parents: 97
diff changeset
147 if (this->child)
97d717829ff0 More work on mke2fs.c. Random in-progress snapshot...
Rob Landley <rob@landley.net>
parents: 97
diff changeset
148 this->st.st_blocks = check_treesize(this->child, &this->st.st_size);
97d717829ff0 More work on mke2fs.c. Random in-progress snapshot...
Rob Landley <rob@landley.net>
parents: 97
diff changeset
149 else if (S_ISREG(this->st.st_mode)) {
112
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
150 this->st.st_blocks = file_blocks_used(this->st.st_size, 0);
99
97d717829ff0 More work on mke2fs.c. Random in-progress snapshot...
Rob Landley <rob@landley.net>
parents: 97
diff changeset
151 TT.treeblocks += this->st.st_blocks;
97d717829ff0 More work on mke2fs.c. Random in-progress snapshot...
Rob Landley <rob@landley.net>
parents: 97
diff changeset
152 }
97d717829ff0 More work on mke2fs.c. Random in-progress snapshot...
Rob Landley <rob@landley.net>
parents: 97
diff changeset
153 this = this->next;
97d717829ff0 More work on mke2fs.c. Random in-progress snapshot...
Rob Landley <rob@landley.net>
parents: 97
diff changeset
154 }
112
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
155 TT.treeblocks += blocks = file_blocks_used(*size, 0);
99
97d717829ff0 More work on mke2fs.c. Random in-progress snapshot...
Rob Landley <rob@landley.net>
parents: 97
diff changeset
156 TT.treeinodes++;
97d717829ff0 More work on mke2fs.c. Random in-progress snapshot...
Rob Landley <rob@landley.net>
parents: 97
diff changeset
157
97d717829ff0 More work on mke2fs.c. Random in-progress snapshot...
Rob Landley <rob@landley.net>
parents: 97
diff changeset
158 return blocks;
97d717829ff0 More work on mke2fs.c. Random in-progress snapshot...
Rob Landley <rob@landley.net>
parents: 97
diff changeset
159 }
97d717829ff0 More work on mke2fs.c. Random in-progress snapshot...
Rob Landley <rob@landley.net>
parents: 97
diff changeset
160
112
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
161 // Calculate inode numbers and link counts.
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
162 //
101
ff85a83e7d7e Calculate st_nlink for each node, via a small but n^2 algorithm.
Rob Landley <rob@landley.net>
parents: 99
diff changeset
163 // To do this right I need to copy the tree and sort it, but here's a really
ff85a83e7d7e Calculate st_nlink for each node, via a small but n^2 algorithm.
Rob Landley <rob@landley.net>
parents: 99
diff changeset
164 // ugly n^2 way of dealing with the problem that doesn't scale well to large
112
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
165 // numbers of files (> 100,000) but can be done in very little code.
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
166 // This rewrites inode numbers to their final values, allocating depth first.
101
ff85a83e7d7e Calculate st_nlink for each node, via a small but n^2 algorithm.
Rob Landley <rob@landley.net>
parents: 99
diff changeset
167
112
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
168 static void check_treelinks(struct dirtree *tree)
101
ff85a83e7d7e Calculate st_nlink for each node, via a small but n^2 algorithm.
Rob Landley <rob@landley.net>
parents: 99
diff changeset
169 {
112
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
170 struct dirtree *this=tree, *that;
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
171 long inode = INODES_RESERVED;
101
ff85a83e7d7e Calculate st_nlink for each node, via a small but n^2 algorithm.
Rob Landley <rob@landley.net>
parents: 99
diff changeset
172
112
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
173 while (this) {
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
174 ++inode;
104
1c2f6d2e25de Precalculate block and inode usage given a starting file tree. This compiles,
Rob Landley <rob@landley.net>
parents: 101
diff changeset
175 // Since we can't hardlink to directories, we know their link count.
1c2f6d2e25de Precalculate block and inode usage given a starting file tree. This compiles,
Rob Landley <rob@landley.net>
parents: 101
diff changeset
176 if (S_ISDIR(this->st.st_mode)) this->st.st_nlink = 2;
1c2f6d2e25de Precalculate block and inode usage given a starting file tree. This compiles,
Rob Landley <rob@landley.net>
parents: 101
diff changeset
177 else {
112
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
178 dev_t new = this->st.st_dev;
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
179
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
180 if (!new) continue;
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
181
104
1c2f6d2e25de Precalculate block and inode usage given a starting file tree. This compiles,
Rob Landley <rob@landley.net>
parents: 101
diff changeset
182 this->st.st_nlink = 0;
112
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
183 for (that = tree; that; that = treenext(that)) {
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
184 if (this->st.st_ino == that->st.st_ino &&
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
185 this->st.st_dev == that->st.st_dev)
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
186 {
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
187 this->st.st_nlink++;
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
188 this->st.st_ino = inode;
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
189 }
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
190 }
104
1c2f6d2e25de Precalculate block and inode usage given a starting file tree. This compiles,
Rob Landley <rob@landley.net>
parents: 101
diff changeset
191 }
112
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
192 this->st.st_ino = inode;
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
193 this = treenext(this);
101
ff85a83e7d7e Calculate st_nlink for each node, via a small but n^2 algorithm.
Rob Landley <rob@landley.net>
parents: 99
diff changeset
194 }
ff85a83e7d7e Calculate st_nlink for each node, via a small but n^2 algorithm.
Rob Landley <rob@landley.net>
parents: 99
diff changeset
195 }
ff85a83e7d7e Calculate st_nlink for each node, via a small but n^2 algorithm.
Rob Landley <rob@landley.net>
parents: 99
diff changeset
196
53
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on.
Rob Landley <rob@landley.net>
parents:
diff changeset
197 // According to http://www.opengroup.org/onlinepubs/9629399/apdxa.htm
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on.
Rob Landley <rob@landley.net>
parents:
diff changeset
198 // we should generate a uuid structure by reading a clock with 100 nanosecond
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on.
Rob Landley <rob@landley.net>
parents:
diff changeset
199 // precision, normalizing it to the start of the gregorian calendar in 1582,
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on.
Rob Landley <rob@landley.net>
parents:
diff changeset
200 // and looking up our eth0 mac address.
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on.
Rob Landley <rob@landley.net>
parents:
diff changeset
201 //
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on.
Rob Landley <rob@landley.net>
parents:
diff changeset
202 // On the other hand, we have 128 bits to come up with a unique identifier, of
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on.
Rob Landley <rob@landley.net>
parents:
diff changeset
203 // which 6 have a defined value. /dev/urandom it is.
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on.
Rob Landley <rob@landley.net>
parents:
diff changeset
204
143
9cbb323f297f Break out dirtree.c and let it call a function instead of returning the data.
Rob Landley <rob@landley.net>
parents: 112
diff changeset
205 static void create_uuid(char *uuid)
53
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on.
Rob Landley <rob@landley.net>
parents:
diff changeset
206 {
99
97d717829ff0 More work on mke2fs.c. Random in-progress snapshot...
Rob Landley <rob@landley.net>
parents: 97
diff changeset
207 // Read 128 random bits
53
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on.
Rob Landley <rob@landley.net>
parents:
diff changeset
208 int fd = xopen("/dev/urandom", O_RDONLY);
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on.
Rob Landley <rob@landley.net>
parents:
diff changeset
209 xreadall(fd, uuid, 16);
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on.
Rob Landley <rob@landley.net>
parents:
diff changeset
210 close(fd);
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on.
Rob Landley <rob@landley.net>
parents:
diff changeset
211
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on.
Rob Landley <rob@landley.net>
parents:
diff changeset
212 // Claim to be a DCE format UUID.
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on.
Rob Landley <rob@landley.net>
parents:
diff changeset
213 uuid[6] = (uuid[6] & 0x0F) | 0x40;
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on.
Rob Landley <rob@landley.net>
parents:
diff changeset
214 uuid[8] = (uuid[8] & 0x3F) | 0x80;
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on.
Rob Landley <rob@landley.net>
parents:
diff changeset
215
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on.
Rob Landley <rob@landley.net>
parents:
diff changeset
216 // rfc2518 section 6.4.1 suggests if we're not using a macaddr, we should
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on.
Rob Landley <rob@landley.net>
parents:
diff changeset
217 // set bit 1 of the node ID, which is the mac multicast bit. This means we
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on.
Rob Landley <rob@landley.net>
parents:
diff changeset
218 // should never collide with anybody actually using a macaddr.
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on.
Rob Landley <rob@landley.net>
parents:
diff changeset
219 uuid[11] = uuid[11] | 128;
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on.
Rob Landley <rob@landley.net>
parents:
diff changeset
220 }
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on.
Rob Landley <rob@landley.net>
parents:
diff changeset
221
112
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
222 // Calculate inodes per group from total inodes.
104
1c2f6d2e25de Precalculate block and inode usage given a starting file tree. This compiles,
Rob Landley <rob@landley.net>
parents: 101
diff changeset
223 static uint32_t get_inodespg(uint32_t inodes)
1c2f6d2e25de Precalculate block and inode usage given a starting file tree. This compiles,
Rob Landley <rob@landley.net>
parents: 101
diff changeset
224 {
1c2f6d2e25de Precalculate block and inode usage given a starting file tree. This compiles,
Rob Landley <rob@landley.net>
parents: 101
diff changeset
225 uint32_t temp;
1c2f6d2e25de Precalculate block and inode usage given a starting file tree. This compiles,
Rob Landley <rob@landley.net>
parents: 101
diff changeset
226
112
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
227 // Round up to fill complete inode blocks.
104
1c2f6d2e25de Precalculate block and inode usage given a starting file tree. This compiles,
Rob Landley <rob@landley.net>
parents: 101
diff changeset
228 temp = (inodes + TT.groups - 1) / TT.groups;
1c2f6d2e25de Precalculate block and inode usage given a starting file tree. This compiles,
Rob Landley <rob@landley.net>
parents: 101
diff changeset
229 inodes = TT.blocksize/sizeof(struct ext2_inode);
1c2f6d2e25de Precalculate block and inode usage given a starting file tree. This compiles,
Rob Landley <rob@landley.net>
parents: 101
diff changeset
230 return ((temp + inodes - 1)/inodes)*inodes;
1c2f6d2e25de Precalculate block and inode usage given a starting file tree. This compiles,
Rob Landley <rob@landley.net>
parents: 101
diff changeset
231 }
1c2f6d2e25de Precalculate block and inode usage given a starting file tree. This compiles,
Rob Landley <rob@landley.net>
parents: 101
diff changeset
232
112
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
233 // Fill out superblock and TT structures.
53
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on.
Rob Landley <rob@landley.net>
parents:
diff changeset
234
82
612c8d6c2829 More work on mke2fs.
Rob Landley <rob@landley.net>
parents: 81
diff changeset
235 static void init_superblock(struct ext2_superblock *sb)
81
f95f6fd94eed Move superblock initialization to a function. Trim unused padding from
Rob Landley <rob@landley.net>
parents: 80
diff changeset
236 {
f95f6fd94eed Move superblock initialization to a function. Trim unused padding from
Rob Landley <rob@landley.net>
parents: 80
diff changeset
237 uint32_t temp;
53
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on.
Rob Landley <rob@landley.net>
parents:
diff changeset
238
82
612c8d6c2829 More work on mke2fs.
Rob Landley <rob@landley.net>
parents: 81
diff changeset
239 // Set log_block_size and log_frag_size.
76
e6332139adae More work on mke2fs.
Rob Landley <rob@landley.net>
parents: 75
diff changeset
240
82
612c8d6c2829 More work on mke2fs.
Rob Landley <rob@landley.net>
parents: 81
diff changeset
241 for (temp = 0; temp < 4; temp++) if (TT.blocksize == 1024<<temp) break;
612c8d6c2829 More work on mke2fs.
Rob Landley <rob@landley.net>
parents: 81
diff changeset
242 if (temp==4) error_exit("bad blocksize");
76
e6332139adae More work on mke2fs.
Rob Landley <rob@landley.net>
parents: 75
diff changeset
243 sb->log_block_size = sb->log_frag_size = SWAP_LE32(temp);
e6332139adae More work on mke2fs.
Rob Landley <rob@landley.net>
parents: 75
diff changeset
244
80
7a058d60faf1 One more field, minor shrinking, and start on block groups.
Rob Landley <rob@landley.net>
parents: 79
diff changeset
245 // Fill out blocks_count, r_blocks_count, first_data_block
76
e6332139adae More work on mke2fs.
Rob Landley <rob@landley.net>
parents: 75
diff changeset
246
e6332139adae More work on mke2fs.
Rob Landley <rob@landley.net>
parents: 75
diff changeset
247 sb->blocks_count = SWAP_LE32(TT.blocks);
112
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
248 sb->free_blocks_count = SWAP_LE32(TT.freeblocks);
104
1c2f6d2e25de Precalculate block and inode usage given a starting file tree. This compiles,
Rob Landley <rob@landley.net>
parents: 101
diff changeset
249 temp = (TT.blocks * (uint64_t)TT.reserved_percent) / 100;
76
e6332139adae More work on mke2fs.
Rob Landley <rob@landley.net>
parents: 75
diff changeset
250 sb->r_blocks_count = SWAP_LE32(temp);
e6332139adae More work on mke2fs.
Rob Landley <rob@landley.net>
parents: 75
diff changeset
251
84
bdbef4ab4ac6 This creates an almost valid empty ext2 filesystem, except for a few superblock
Rob Landley <rob@landley.net>
parents: 83
diff changeset
252 sb->first_data_block = SWAP_LE32(TT.blocksize == 1024 ? 1 : 0);
80
7a058d60faf1 One more field, minor shrinking, and start on block groups.
Rob Landley <rob@landley.net>
parents: 79
diff changeset
253
76
e6332139adae More work on mke2fs.
Rob Landley <rob@landley.net>
parents: 75
diff changeset
254 // Set blocks_per_group and frags_per_group, which is the size of an
e6332139adae More work on mke2fs.
Rob Landley <rob@landley.net>
parents: 75
diff changeset
255 // allocation bitmap that fits in one block (I.E. how many bits per block)?
e6332139adae More work on mke2fs.
Rob Landley <rob@landley.net>
parents: 75
diff changeset
256
104
1c2f6d2e25de Precalculate block and inode usage given a starting file tree. This compiles,
Rob Landley <rob@landley.net>
parents: 101
diff changeset
257 sb->blocks_per_group = sb->frags_per_group = SWAP_LE32(TT.blockbits);
76
e6332139adae More work on mke2fs.
Rob Landley <rob@landley.net>
parents: 75
diff changeset
258
79
1aff4181427b Filling out most of the ext2 superblock correctly now.
Rob Landley <rob@landley.net>
parents: 76
diff changeset
259 // Set inodes_per_group and total inodes_count
99
97d717829ff0 More work on mke2fs.c. Random in-progress snapshot...
Rob Landley <rob@landley.net>
parents: 97
diff changeset
260 sb->inodes_per_group = SWAP_LE32(TT.inodespg);
97d717829ff0 More work on mke2fs.c. Random in-progress snapshot...
Rob Landley <rob@landley.net>
parents: 97
diff changeset
261 sb->inodes_count = SWAP_LE32(TT.inodespg * TT.groups);
79
1aff4181427b Filling out most of the ext2 superblock correctly now.
Rob Landley <rob@landley.net>
parents: 76
diff changeset
262
112
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
263 // Determine free inodes.
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
264 temp = TT.inodespg*TT.groups - INODES_RESERVED;
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
265 if (temp < TT.treeinodes) error_exit("Not enough inodes.\n");
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
266 sb->free_inodes_count = SWAP_LE32(temp - TT.treeinodes);
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
267
79
1aff4181427b Filling out most of the ext2 superblock correctly now.
Rob Landley <rob@landley.net>
parents: 76
diff changeset
268 // Fill out the rest of the superblock.
76
e6332139adae More work on mke2fs.
Rob Landley <rob@landley.net>
parents: 75
diff changeset
269 sb->max_mnt_count=0xFFFF;
e6332139adae More work on mke2fs.
Rob Landley <rob@landley.net>
parents: 75
diff changeset
270 sb->wtime = sb->lastcheck = sb->mkfs_time = SWAP_LE32(time(NULL));
e6332139adae More work on mke2fs.
Rob Landley <rob@landley.net>
parents: 75
diff changeset
271 sb->magic = SWAP_LE32(0xEF53);
e6332139adae More work on mke2fs.
Rob Landley <rob@landley.net>
parents: 75
diff changeset
272 sb->state = sb->errors = SWAP_LE16(1);
e6332139adae More work on mke2fs.
Rob Landley <rob@landley.net>
parents: 75
diff changeset
273
53
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on.
Rob Landley <rob@landley.net>
parents:
diff changeset
274 sb->rev_level = SWAP_LE32(1);
84
bdbef4ab4ac6 This creates an almost valid empty ext2 filesystem, except for a few superblock
Rob Landley <rob@landley.net>
parents: 83
diff changeset
275 sb->first_ino = SWAP_LE32(INODES_RESERVED+1);
81
f95f6fd94eed Move superblock initialization to a function. Trim unused padding from
Rob Landley <rob@landley.net>
parents: 80
diff changeset
276 sb->inode_size = SWAP_LE16(sizeof(struct ext2_inode));
53
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on.
Rob Landley <rob@landley.net>
parents:
diff changeset
277 sb->feature_incompat = SWAP_LE32(EXT2_FEATURE_INCOMPAT_FILETYPE);
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on.
Rob Landley <rob@landley.net>
parents:
diff changeset
278 sb->feature_ro_compat = SWAP_LE32(EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER);
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on.
Rob Landley <rob@landley.net>
parents:
diff changeset
279
143
9cbb323f297f Break out dirtree.c and let it call a function instead of returning the data.
Rob Landley <rob@landley.net>
parents: 112
diff changeset
280 create_uuid(sb->uuid);
112
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
281
83
4b25264da01b mke2fs: Stopping for dinner. It compiles.
Rob Landley <rob@landley.net>
parents: 82
diff changeset
282 // TODO If we're called as mke3fs or mkfs.ext3, do a journal.
53
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on.
Rob Landley <rob@landley.net>
parents:
diff changeset
283
75
89ca591a9236 More random progress on mke2fs. Nothing to see yet.
Rob Landley <rob@landley.net>
parents: 53
diff changeset
284 //if (strchr(toys.which->name,'3'))
101
ff85a83e7d7e Calculate st_nlink for each node, via a small but n^2 algorithm.
Rob Landley <rob@landley.net>
parents: 99
diff changeset
285 // sb->feature_compat |= SWAP_LE32(EXT3_FEATURE_COMPAT_HAS_JOURNAL);
81
f95f6fd94eed Move superblock initialization to a function. Trim unused padding from
Rob Landley <rob@landley.net>
parents: 80
diff changeset
286 }
f95f6fd94eed Move superblock initialization to a function. Trim unused padding from
Rob Landley <rob@landley.net>
parents: 80
diff changeset
287
104
1c2f6d2e25de Precalculate block and inode usage given a starting file tree. This compiles,
Rob Landley <rob@landley.net>
parents: 101
diff changeset
288 // Does this group contain a superblock backup (and group descriptor table)?
1c2f6d2e25de Precalculate block and inode usage given a starting file tree. This compiles,
Rob Landley <rob@landley.net>
parents: 101
diff changeset
289 static int is_sb_group(uint32_t group)
82
612c8d6c2829 More work on mke2fs.
Rob Landley <rob@landley.net>
parents: 81
diff changeset
290 {
104
1c2f6d2e25de Precalculate block and inode usage given a starting file tree. This compiles,
Rob Landley <rob@landley.net>
parents: 101
diff changeset
291 int i;
83
4b25264da01b mke2fs: Stopping for dinner. It compiles.
Rob Landley <rob@landley.net>
parents: 82
diff changeset
292
4b25264da01b mke2fs: Stopping for dinner. It compiles.
Rob Landley <rob@landley.net>
parents: 82
diff changeset
293 // Superblock backups are on groups 0, 1, and powers of 3, 5, and 7.
104
1c2f6d2e25de Precalculate block and inode usage given a starting file tree. This compiles,
Rob Landley <rob@landley.net>
parents: 101
diff changeset
294 if(!group || group==1) return 1;
83
4b25264da01b mke2fs: Stopping for dinner. It compiles.
Rob Landley <rob@landley.net>
parents: 82
diff changeset
295 for (i=3; i<9; i+=2) {
4b25264da01b mke2fs: Stopping for dinner. It compiles.
Rob Landley <rob@landley.net>
parents: 82
diff changeset
296 int j = i;
4b25264da01b mke2fs: Stopping for dinner. It compiles.
Rob Landley <rob@landley.net>
parents: 82
diff changeset
297 while (j<group) j*=i;
104
1c2f6d2e25de Precalculate block and inode usage given a starting file tree. This compiles,
Rob Landley <rob@landley.net>
parents: 101
diff changeset
298 if (j==group) return 1;
83
4b25264da01b mke2fs: Stopping for dinner. It compiles.
Rob Landley <rob@landley.net>
parents: 82
diff changeset
299 }
104
1c2f6d2e25de Precalculate block and inode usage given a starting file tree. This compiles,
Rob Landley <rob@landley.net>
parents: 101
diff changeset
300 return 0;
1c2f6d2e25de Precalculate block and inode usage given a starting file tree. This compiles,
Rob Landley <rob@landley.net>
parents: 101
diff changeset
301 }
1c2f6d2e25de Precalculate block and inode usage given a starting file tree. This compiles,
Rob Landley <rob@landley.net>
parents: 101
diff changeset
302
1c2f6d2e25de Precalculate block and inode usage given a starting file tree. This compiles,
Rob Landley <rob@landley.net>
parents: 101
diff changeset
303
112
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
304 // Number of blocks used in group by optional superblock/group list backup.
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
305 static int group_superblock_overhead(uint32_t group)
104
1c2f6d2e25de Precalculate block and inode usage given a starting file tree. This compiles,
Rob Landley <rob@landley.net>
parents: 101
diff changeset
306 {
1c2f6d2e25de Precalculate block and inode usage given a starting file tree. This compiles,
Rob Landley <rob@landley.net>
parents: 101
diff changeset
307 int used;
82
612c8d6c2829 More work on mke2fs.
Rob Landley <rob@landley.net>
parents: 81
diff changeset
308
104
1c2f6d2e25de Precalculate block and inode usage given a starting file tree. This compiles,
Rob Landley <rob@landley.net>
parents: 101
diff changeset
309 if (!is_sb_group(group)) return 0;
1c2f6d2e25de Precalculate block and inode usage given a starting file tree. This compiles,
Rob Landley <rob@landley.net>
parents: 101
diff changeset
310
112
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
311 // How many blocks does the group descriptor table take up?
104
1c2f6d2e25de Precalculate block and inode usage given a starting file tree. This compiles,
Rob Landley <rob@landley.net>
parents: 101
diff changeset
312 used = TT.groups * sizeof(struct ext2_group);
1c2f6d2e25de Precalculate block and inode usage given a starting file tree. This compiles,
Rob Landley <rob@landley.net>
parents: 101
diff changeset
313 used += TT.blocksize - 1;
1c2f6d2e25de Precalculate block and inode usage given a starting file tree. This compiles,
Rob Landley <rob@landley.net>
parents: 101
diff changeset
314 used /= TT.blocksize;
1c2f6d2e25de Precalculate block and inode usage given a starting file tree. This compiles,
Rob Landley <rob@landley.net>
parents: 101
diff changeset
315 // Plus the superblock itself.
1c2f6d2e25de Precalculate block and inode usage given a starting file tree. This compiles,
Rob Landley <rob@landley.net>
parents: 101
diff changeset
316 used++;
1c2f6d2e25de Precalculate block and inode usage given a starting file tree. This compiles,
Rob Landley <rob@landley.net>
parents: 101
diff changeset
317 // And a corner case.
1c2f6d2e25de Precalculate block and inode usage given a starting file tree. This compiles,
Rob Landley <rob@landley.net>
parents: 101
diff changeset
318 if (!group && TT.blocksize == 1024) used++;
82
612c8d6c2829 More work on mke2fs.
Rob Landley <rob@landley.net>
parents: 81
diff changeset
319
612c8d6c2829 More work on mke2fs.
Rob Landley <rob@landley.net>
parents: 81
diff changeset
320 return used;
612c8d6c2829 More work on mke2fs.
Rob Landley <rob@landley.net>
parents: 81
diff changeset
321 }
612c8d6c2829 More work on mke2fs.
Rob Landley <rob@landley.net>
parents: 81
diff changeset
322
112
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
323 // Number of blocks used in group to store superblock/group/inode list
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
324 static int group_overhead(uint32_t group)
104
1c2f6d2e25de Precalculate block and inode usage given a starting file tree. This compiles,
Rob Landley <rob@landley.net>
parents: 101
diff changeset
325 {
112
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
326 // Return superblock backup overhead (if any), plus block/inode
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
327 // allocation bitmaps, plus inode tables.
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
328 return group_superblock_overhead(group) + 2 + get_inodespg(TT.inodespg)
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
329 / (TT.blocksize/sizeof(struct ext2_inode));
104
1c2f6d2e25de Precalculate block and inode usage given a starting file tree. This compiles,
Rob Landley <rob@landley.net>
parents: 101
diff changeset
330 }
1c2f6d2e25de Precalculate block and inode usage given a starting file tree. This compiles,
Rob Landley <rob@landley.net>
parents: 101
diff changeset
331
112
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
332 // In bitmap "array" set "len" bits starting at position "start" (from 0).
83
4b25264da01b mke2fs: Stopping for dinner. It compiles.
Rob Landley <rob@landley.net>
parents: 82
diff changeset
333 static void bits_set(char *array, int start, int len)
4b25264da01b mke2fs: Stopping for dinner. It compiles.
Rob Landley <rob@landley.net>
parents: 82
diff changeset
334 {
4b25264da01b mke2fs: Stopping for dinner. It compiles.
Rob Landley <rob@landley.net>
parents: 82
diff changeset
335 while(len) {
4b25264da01b mke2fs: Stopping for dinner. It compiles.
Rob Landley <rob@landley.net>
parents: 82
diff changeset
336 if ((start&7) || len<8) {
4b25264da01b mke2fs: Stopping for dinner. It compiles.
Rob Landley <rob@landley.net>
parents: 82
diff changeset
337 array[start/8]|=(1<<(start&7));
4b25264da01b mke2fs: Stopping for dinner. It compiles.
Rob Landley <rob@landley.net>
parents: 82
diff changeset
338 start++;
84
bdbef4ab4ac6 This creates an almost valid empty ext2 filesystem, except for a few superblock
Rob Landley <rob@landley.net>
parents: 83
diff changeset
339 len--;
83
4b25264da01b mke2fs: Stopping for dinner. It compiles.
Rob Landley <rob@landley.net>
parents: 82
diff changeset
340 } else {
4b25264da01b mke2fs: Stopping for dinner. It compiles.
Rob Landley <rob@landley.net>
parents: 82
diff changeset
341 array[start/8]=255;
4b25264da01b mke2fs: Stopping for dinner. It compiles.
Rob Landley <rob@landley.net>
parents: 82
diff changeset
342 start+=8;
84
bdbef4ab4ac6 This creates an almost valid empty ext2 filesystem, except for a few superblock
Rob Landley <rob@landley.net>
parents: 83
diff changeset
343 len-=8;
83
4b25264da01b mke2fs: Stopping for dinner. It compiles.
Rob Landley <rob@landley.net>
parents: 82
diff changeset
344 }
4b25264da01b mke2fs: Stopping for dinner. It compiles.
Rob Landley <rob@landley.net>
parents: 82
diff changeset
345 }
4b25264da01b mke2fs: Stopping for dinner. It compiles.
Rob Landley <rob@landley.net>
parents: 82
diff changeset
346 }
4b25264da01b mke2fs: Stopping for dinner. It compiles.
Rob Landley <rob@landley.net>
parents: 82
diff changeset
347
99
97d717829ff0 More work on mke2fs.c. Random in-progress snapshot...
Rob Landley <rob@landley.net>
parents: 97
diff changeset
348 // Seek past len bytes (to maintain sparse file), or write zeroes if output
97d717829ff0 More work on mke2fs.c. Random in-progress snapshot...
Rob Landley <rob@landley.net>
parents: 97
diff changeset
349 // not seekable
97d717829ff0 More work on mke2fs.c. Random in-progress snapshot...
Rob Landley <rob@landley.net>
parents: 97
diff changeset
350 static void put_zeroes(int len)
97d717829ff0 More work on mke2fs.c. Random in-progress snapshot...
Rob Landley <rob@landley.net>
parents: 97
diff changeset
351 {
112
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
352 if(-1 == lseek(TT.fsfd, len, SEEK_SET)) {
99
97d717829ff0 More work on mke2fs.c. Random in-progress snapshot...
Rob Landley <rob@landley.net>
parents: 97
diff changeset
353 memset(toybuf, 0, sizeof(toybuf));
97d717829ff0 More work on mke2fs.c. Random in-progress snapshot...
Rob Landley <rob@landley.net>
parents: 97
diff changeset
354 while (len) {
97d717829ff0 More work on mke2fs.c. Random in-progress snapshot...
Rob Landley <rob@landley.net>
parents: 97
diff changeset
355 int out = len > sizeof(toybuf) ? sizeof(toybuf) : len;
97d717829ff0 More work on mke2fs.c. Random in-progress snapshot...
Rob Landley <rob@landley.net>
parents: 97
diff changeset
356 xwrite(TT.fsfd, toybuf, out);
97d717829ff0 More work on mke2fs.c. Random in-progress snapshot...
Rob Landley <rob@landley.net>
parents: 97
diff changeset
357 len -= out;
97d717829ff0 More work on mke2fs.c. Random in-progress snapshot...
Rob Landley <rob@landley.net>
parents: 97
diff changeset
358 }
97d717829ff0 More work on mke2fs.c. Random in-progress snapshot...
Rob Landley <rob@landley.net>
parents: 97
diff changeset
359 }
97d717829ff0 More work on mke2fs.c. Random in-progress snapshot...
Rob Landley <rob@landley.net>
parents: 97
diff changeset
360 }
97d717829ff0 More work on mke2fs.c. Random in-progress snapshot...
Rob Landley <rob@landley.net>
parents: 97
diff changeset
361
112
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
362 // Fill out an inode structure from struct stat info in dirtree.
99
97d717829ff0 More work on mke2fs.c. Random in-progress snapshot...
Rob Landley <rob@landley.net>
parents: 97
diff changeset
363 static void fill_inode(struct ext2_inode *in, struct dirtree *this)
97d717829ff0 More work on mke2fs.c. Random in-progress snapshot...
Rob Landley <rob@landley.net>
parents: 97
diff changeset
364 {
112
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
365 uint32_t fbu[15];
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
366 int temp;
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
367
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
368 file_blocks_used(this->st.st_size, fbu);
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
369
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
370 // If this inode needs data blocks allocated to it.
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
371 if (this->st.st_size) {
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
372 int i, group = TT.nextblock/TT.blockbits;
99
97d717829ff0 More work on mke2fs.c. Random in-progress snapshot...
Rob Landley <rob@landley.net>
parents: 97
diff changeset
373
112
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
374 // TODO: teach this about indirect blocks.
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
375 for (i=0; i<15; i++) {
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
376 // If we just jumped into a new group, skip group overhead blocks.
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
377 while (group >= TT.nextgroup)
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
378 TT.nextblock += group_overhead(TT.nextgroup++);
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
379 }
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
380 }
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
381 // TODO : S_ISREG/DIR/CHR/BLK/FIFO/LNK/SOCK(m)
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
382 in->mode = SWAP_LE32(this->st.st_mode);
99
97d717829ff0 More work on mke2fs.c. Random in-progress snapshot...
Rob Landley <rob@landley.net>
parents: 97
diff changeset
383
112
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
384 in->uid = SWAP_LE16(this->st.st_uid & 0xFFFF);
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
385 in->uid_high = SWAP_LE16(this->st.st_uid >> 16);
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
386 in->gid = SWAP_LE16(this->st.st_gid & 0xFFFF);
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
387 in->gid_high = SWAP_LE16(this->st.st_gid >> 16);
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
388 in->size = SWAP_LE32(this->st.st_size & 0xFFFFFFFF);
99
97d717829ff0 More work on mke2fs.c. Random in-progress snapshot...
Rob Landley <rob@landley.net>
parents: 97
diff changeset
389
112
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
390 // Contortions to make the compiler not generate a warning for x>>32
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
391 // when x is 32 bits. The optimizer should clean this up.
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
392 if (sizeof(this->st.st_size) > 4) temp = 32;
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
393 else temp = 0;
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
394 if (temp) in->dir_acl = SWAP_LE32(this->st.st_size >> temp);
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
395
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
396 in->atime = SWAP_LE32(this->st.st_atime);
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
397 in->ctime = SWAP_LE32(this->st.st_ctime);
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
398 in->mtime = SWAP_LE32(this->st.st_mtime);
99
97d717829ff0 More work on mke2fs.c. Random in-progress snapshot...
Rob Landley <rob@landley.net>
parents: 97
diff changeset
399
112
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
400 in->links_count = SWAP_LE16(this->st.st_nlink);
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
401 in->blocks = SWAP_LE32(this->st.st_blocks);
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
402 // in->faddr
99
97d717829ff0 More work on mke2fs.c. Random in-progress snapshot...
Rob Landley <rob@landley.net>
parents: 97
diff changeset
403 }
97d717829ff0 More work on mke2fs.c. Random in-progress snapshot...
Rob Landley <rob@landley.net>
parents: 97
diff changeset
404
143
9cbb323f297f Break out dirtree.c and let it call a function instead of returning the data.
Rob Landley <rob@landley.net>
parents: 112
diff changeset
405 // Works like an archiver.
9cbb323f297f Break out dirtree.c and let it call a function instead of returning the data.
Rob Landley <rob@landley.net>
parents: 112
diff changeset
406 // The first argument is the name of the file to create. If it already
9cbb323f297f Break out dirtree.c and let it call a function instead of returning the data.
Rob Landley <rob@landley.net>
parents: 112
diff changeset
407 // exists, that size will be used.
9cbb323f297f Break out dirtree.c and let it call a function instead of returning the data.
Rob Landley <rob@landley.net>
parents: 112
diff changeset
408
186
25447caf1b4b Change command main() functions to return void, and exit(toys.exitval) from
Rob Landley <rob@landley.net>
parents: 143
diff changeset
409 void mke2fs_main(void)
81
f95f6fd94eed Move superblock initialization to a function. Trim unused padding from
Rob Landley <rob@landley.net>
parents: 80
diff changeset
410 {
104
1c2f6d2e25de Precalculate block and inode usage given a starting file tree. This compiles,
Rob Landley <rob@landley.net>
parents: 101
diff changeset
411 int i, temp;
82
612c8d6c2829 More work on mke2fs.
Rob Landley <rob@landley.net>
parents: 81
diff changeset
412 off_t length;
112
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
413 uint32_t usedblocks, usedinodes, dtiblk, dtbblk;
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
414 struct dirtree *dti, *dtb;
143
9cbb323f297f Break out dirtree.c and let it call a function instead of returning the data.
Rob Landley <rob@landley.net>
parents: 112
diff changeset
415
81
f95f6fd94eed Move superblock initialization to a function. Trim unused padding from
Rob Landley <rob@landley.net>
parents: 80
diff changeset
416 // Handle command line arguments.
f95f6fd94eed Move superblock initialization to a function. Trim unused padding from
Rob Landley <rob@landley.net>
parents: 80
diff changeset
417
f95f6fd94eed Move superblock initialization to a function. Trim unused padding from
Rob Landley <rob@landley.net>
parents: 80
diff changeset
418 if (toys.optargs[1]) {
f95f6fd94eed Move superblock initialization to a function. Trim unused padding from
Rob Landley <rob@landley.net>
parents: 80
diff changeset
419 sscanf(toys.optargs[1], "%u", &TT.blocks);
f95f6fd94eed Move superblock initialization to a function. Trim unused padding from
Rob Landley <rob@landley.net>
parents: 80
diff changeset
420 temp = O_RDWR|O_CREAT;
f95f6fd94eed Move superblock initialization to a function. Trim unused padding from
Rob Landley <rob@landley.net>
parents: 80
diff changeset
421 } else temp = O_RDWR;
104
1c2f6d2e25de Precalculate block and inode usage given a starting file tree. This compiles,
Rob Landley <rob@landley.net>
parents: 101
diff changeset
422 if (!TT.reserved_percent) TT.reserved_percent = 5;
1c2f6d2e25de Precalculate block and inode usage given a starting file tree. This compiles,
Rob Landley <rob@landley.net>
parents: 101
diff changeset
423
1c2f6d2e25de Precalculate block and inode usage given a starting file tree. This compiles,
Rob Landley <rob@landley.net>
parents: 101
diff changeset
424 // TODO: Check if filesystem is mounted here
1c2f6d2e25de Precalculate block and inode usage given a starting file tree. This compiles,
Rob Landley <rob@landley.net>
parents: 101
diff changeset
425
1c2f6d2e25de Precalculate block and inode usage given a starting file tree. This compiles,
Rob Landley <rob@landley.net>
parents: 101
diff changeset
426 // For mke?fs, open file. For gene?fs, create file.
1c2f6d2e25de Precalculate block and inode usage given a starting file tree. This compiles,
Rob Landley <rob@landley.net>
parents: 101
diff changeset
427 TT.fsfd = xcreate(*toys.optargs, temp, 0777);
1c2f6d2e25de Precalculate block and inode usage given a starting file tree. This compiles,
Rob Landley <rob@landley.net>
parents: 101
diff changeset
428
1c2f6d2e25de Precalculate block and inode usage given a starting file tree. This compiles,
Rob Landley <rob@landley.net>
parents: 101
diff changeset
429 // Determine appropriate block size and block count from file length.
1c2f6d2e25de Precalculate block and inode usage given a starting file tree. This compiles,
Rob Landley <rob@landley.net>
parents: 101
diff changeset
430 // (If no length, default to 4k. They can override it on the cmdline.)
1c2f6d2e25de Precalculate block and inode usage given a starting file tree. This compiles,
Rob Landley <rob@landley.net>
parents: 101
diff changeset
431
1c2f6d2e25de Precalculate block and inode usage given a starting file tree. This compiles,
Rob Landley <rob@landley.net>
parents: 101
diff changeset
432 length = fdlength(TT.fsfd);
1c2f6d2e25de Precalculate block and inode usage given a starting file tree. This compiles,
Rob Landley <rob@landley.net>
parents: 101
diff changeset
433 if (!TT.blocksize) TT.blocksize = (length && length < 1<<29) ? 1024 : 4096;
1c2f6d2e25de Precalculate block and inode usage given a starting file tree. This compiles,
Rob Landley <rob@landley.net>
parents: 101
diff changeset
434 TT.blockbits = 8*TT.blocksize;
1c2f6d2e25de Precalculate block and inode usage given a starting file tree. This compiles,
Rob Landley <rob@landley.net>
parents: 101
diff changeset
435 if (!TT.blocks) TT.blocks = length/TT.blocksize;
1c2f6d2e25de Precalculate block and inode usage given a starting file tree. This compiles,
Rob Landley <rob@landley.net>
parents: 101
diff changeset
436
97
4c81e6375719 Add parent pointer to dirtree, more work on mke2fs (populate dirtree, count
Rob Landley <rob@landley.net>
parents: 84
diff changeset
437 // Collect gene2fs list or lost+found, calculate requirements.
4c81e6375719 Add parent pointer to dirtree, more work on mke2fs (populate dirtree, count
Rob Landley <rob@landley.net>
parents: 84
diff changeset
438
4c81e6375719 Add parent pointer to dirtree, more work on mke2fs (populate dirtree, count
Rob Landley <rob@landley.net>
parents: 84
diff changeset
439 if (TT.gendir) {
4c81e6375719 Add parent pointer to dirtree, more work on mke2fs (populate dirtree, count
Rob Landley <rob@landley.net>
parents: 84
diff changeset
440 strncpy(toybuf, TT.gendir, sizeof(toybuf));
143
9cbb323f297f Break out dirtree.c and let it call a function instead of returning the data.
Rob Landley <rob@landley.net>
parents: 112
diff changeset
441 dti = dirtree_read(toybuf, NULL, NULL);
97
4c81e6375719 Add parent pointer to dirtree, more work on mke2fs (populate dirtree, count
Rob Landley <rob@landley.net>
parents: 84
diff changeset
442 } else {
112
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
443 dti = xzalloc(sizeof(struct dirtree)+11);
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
444 strcpy(dti->name, "lost+found");
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
445 dti->st.st_mode = S_IFDIR|0755;
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
446 dti->st.st_ctime = dti->st.st_mtime = time(NULL);
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
447 }
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
448
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
449 // Add root directory inode. This is iterated through for when finding
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
450 // blocks, but not when finding inodes. The tree's parent pointers don't
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
451 // point back into this.
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
452
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
453 dtb = xzalloc(sizeof(struct dirtree)+1);
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
454 dtb->st.st_mode = S_IFDIR|0755;
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
455 dtb->st.st_ctime = dtb->st.st_mtime = time(NULL);
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
456 dtb->child = dti;
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
457
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
458 // Figure out how much space is used by preset files
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
459 length = check_treesize(dtb, &(dtb->st.st_size));
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
460 check_treelinks(dtb);
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
461
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
462 // Figure out how many total inodes we need.
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
463
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
464 if (!TT.inodes) {
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
465 if (!TT.bytes_per_inode) TT.bytes_per_inode = 8192;
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
466 TT.inodes = (TT.blocks * (uint64_t)TT.blocksize) / TT.bytes_per_inode;
97
4c81e6375719 Add parent pointer to dirtree, more work on mke2fs (populate dirtree, count
Rob Landley <rob@landley.net>
parents: 84
diff changeset
467 }
4c81e6375719 Add parent pointer to dirtree, more work on mke2fs (populate dirtree, count
Rob Landley <rob@landley.net>
parents: 84
diff changeset
468
112
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
469 // If we're generating a filesystem and have no idea how many blocks it
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
470 // needs, start with a minimal guess, find the overhead of that many
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
471 // groups, and loop until this is enough groups to store this many blocks.
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
472 if (!TT.blocks) TT.groups = (TT.treeblocks/TT.blockbits)+1;
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
473 else TT.groups = div_round_up(TT.blocks, TT.blockbits);
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
474
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
475 for (;;) {
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
476 temp = TT.treeblocks;
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
477
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
478 for (i = 0; i<TT.groups; i++) temp += group_overhead(i);
104
1c2f6d2e25de Precalculate block and inode usage given a starting file tree. This compiles,
Rob Landley <rob@landley.net>
parents: 101
diff changeset
479
112
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
480 if (TT.blocks) {
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
481 if (TT.blocks < temp) error_exit("Not enough space.\n");
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
482 break;
104
1c2f6d2e25de Precalculate block and inode usage given a starting file tree. This compiles,
Rob Landley <rob@landley.net>
parents: 101
diff changeset
483 }
112
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
484 if (temp <= TT.groups * TT.blockbits) {
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
485 TT.blocks = temp;
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
486 break;
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
487 }
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
488 TT.groups++;
99
97d717829ff0 More work on mke2fs.c. Random in-progress snapshot...
Rob Landley <rob@landley.net>
parents: 97
diff changeset
489 }
112
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
490 TT.freeblocks = TT.blocks - temp;
104
1c2f6d2e25de Precalculate block and inode usage given a starting file tree. This compiles,
Rob Landley <rob@landley.net>
parents: 101
diff changeset
491
112
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
492 // Now we know all the TT data, initialize superblock structure.
104
1c2f6d2e25de Precalculate block and inode usage given a starting file tree. This compiles,
Rob Landley <rob@landley.net>
parents: 101
diff changeset
493
1c2f6d2e25de Precalculate block and inode usage given a starting file tree. This compiles,
Rob Landley <rob@landley.net>
parents: 101
diff changeset
494 init_superblock(&TT.sb);
1c2f6d2e25de Precalculate block and inode usage given a starting file tree. This compiles,
Rob Landley <rob@landley.net>
parents: 101
diff changeset
495
112
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
496 // Start writing. Skip the first 1k to avoid the boot sector (if any).
104
1c2f6d2e25de Precalculate block and inode usage given a starting file tree. This compiles,
Rob Landley <rob@landley.net>
parents: 101
diff changeset
497 put_zeroes(1024);
101
ff85a83e7d7e Calculate st_nlink for each node, via a small but n^2 algorithm.
Rob Landley <rob@landley.net>
parents: 99
diff changeset
498
104
1c2f6d2e25de Precalculate block and inode usage given a starting file tree. This compiles,
Rob Landley <rob@landley.net>
parents: 101
diff changeset
499 // Loop through block groups, write out each one.
112
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
500 dtiblk = dtbblk = usedblocks = usedinodes = 0;
82
612c8d6c2829 More work on mke2fs.
Rob Landley <rob@landley.net>
parents: 81
diff changeset
501 for (i=0; i<TT.groups; i++) {
83
4b25264da01b mke2fs: Stopping for dinner. It compiles.
Rob Landley <rob@landley.net>
parents: 82
diff changeset
502 struct ext2_inode *in = (struct ext2_inode *)toybuf;
84
bdbef4ab4ac6 This creates an almost valid empty ext2 filesystem, except for a few superblock
Rob Landley <rob@landley.net>
parents: 83
diff changeset
503 uint32_t start, itable, used, end;
83
4b25264da01b mke2fs: Stopping for dinner. It compiles.
Rob Landley <rob@landley.net>
parents: 82
diff changeset
504 int j, slot;
4b25264da01b mke2fs: Stopping for dinner. It compiles.
Rob Landley <rob@landley.net>
parents: 82
diff changeset
505
84
bdbef4ab4ac6 This creates an almost valid empty ext2 filesystem, except for a few superblock
Rob Landley <rob@landley.net>
parents: 83
diff changeset
506 // Where does this group end?
104
1c2f6d2e25de Precalculate block and inode usage given a starting file tree. This compiles,
Rob Landley <rob@landley.net>
parents: 101
diff changeset
507 end = TT.blockbits;
1c2f6d2e25de Precalculate block and inode usage given a starting file tree. This compiles,
Rob Landley <rob@landley.net>
parents: 101
diff changeset
508 if ((i+1)*TT.blockbits > TT.blocks) end = TT.blocks & (TT.blockbits-1);
84
bdbef4ab4ac6 This creates an almost valid empty ext2 filesystem, except for a few superblock
Rob Landley <rob@landley.net>
parents: 83
diff changeset
509
bdbef4ab4ac6 This creates an almost valid empty ext2 filesystem, except for a few superblock
Rob Landley <rob@landley.net>
parents: 83
diff changeset
510 // Blocks used by inode table
99
97d717829ff0 More work on mke2fs.c. Random in-progress snapshot...
Rob Landley <rob@landley.net>
parents: 97
diff changeset
511 itable = (TT.inodespg*sizeof(struct ext2_inode))/TT.blocksize;
84
bdbef4ab4ac6 This creates an almost valid empty ext2 filesystem, except for a few superblock
Rob Landley <rob@landley.net>
parents: 83
diff changeset
512
82
612c8d6c2829 More work on mke2fs.
Rob Landley <rob@landley.net>
parents: 81
diff changeset
513 // If a superblock goes here, write it out.
112
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
514 start = group_superblock_overhead(i);
83
4b25264da01b mke2fs: Stopping for dinner. It compiles.
Rob Landley <rob@landley.net>
parents: 82
diff changeset
515 if (start) {
82
612c8d6c2829 More work on mke2fs.
Rob Landley <rob@landley.net>
parents: 81
diff changeset
516 struct ext2_group *bg = (struct ext2_group *)toybuf;
105
c5b6fb1fe3a4 Calculate block and inode usage in group table and bitmaps.
Rob Landley <rob@landley.net>
parents: 104
diff changeset
517 int treeblocks = TT.treeblocks, treeinodes = TT.treeinodes;
82
612c8d6c2829 More work on mke2fs.
Rob Landley <rob@landley.net>
parents: 81
diff changeset
518
612c8d6c2829 More work on mke2fs.
Rob Landley <rob@landley.net>
parents: 81
diff changeset
519 TT.sb.block_group_nr = SWAP_LE16(i);
612c8d6c2829 More work on mke2fs.
Rob Landley <rob@landley.net>
parents: 81
diff changeset
520
612c8d6c2829 More work on mke2fs.
Rob Landley <rob@landley.net>
parents: 81
diff changeset
521 // Write superblock and pad it up to block size
612c8d6c2829 More work on mke2fs.
Rob Landley <rob@landley.net>
parents: 81
diff changeset
522 xwrite(TT.fsfd, &TT.sb, sizeof(struct ext2_superblock));
612c8d6c2829 More work on mke2fs.
Rob Landley <rob@landley.net>
parents: 81
diff changeset
523 temp = TT.blocksize - sizeof(struct ext2_superblock);
612c8d6c2829 More work on mke2fs.
Rob Landley <rob@landley.net>
parents: 81
diff changeset
524 if (!i && TT.blocksize > 1024) temp -= 1024;
612c8d6c2829 More work on mke2fs.
Rob Landley <rob@landley.net>
parents: 81
diff changeset
525 memset(toybuf, 0, TT.blocksize);
612c8d6c2829 More work on mke2fs.
Rob Landley <rob@landley.net>
parents: 81
diff changeset
526 xwrite(TT.fsfd, toybuf, temp);
612c8d6c2829 More work on mke2fs.
Rob Landley <rob@landley.net>
parents: 81
diff changeset
527
612c8d6c2829 More work on mke2fs.
Rob Landley <rob@landley.net>
parents: 81
diff changeset
528 // Loop through groups to write group descriptor table.
612c8d6c2829 More work on mke2fs.
Rob Landley <rob@landley.net>
parents: 81
diff changeset
529 for(j=0; j<TT.groups; j++) {
612c8d6c2829 More work on mke2fs.
Rob Landley <rob@landley.net>
parents: 81
diff changeset
530
612c8d6c2829 More work on mke2fs.
Rob Landley <rob@landley.net>
parents: 81
diff changeset
531 // Figure out what sector this group starts in.
112
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
532 used = group_superblock_overhead(j);
53
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on.
Rob Landley <rob@landley.net>
parents:
diff changeset
533
82
612c8d6c2829 More work on mke2fs.
Rob Landley <rob@landley.net>
parents: 81
diff changeset
534 // Find next array slot in this block (flush block if full).
83
4b25264da01b mke2fs: Stopping for dinner. It compiles.
Rob Landley <rob@landley.net>
parents: 82
diff changeset
535 slot = j % (TT.blocksize/sizeof(struct ext2_group));
4b25264da01b mke2fs: Stopping for dinner. It compiles.
Rob Landley <rob@landley.net>
parents: 82
diff changeset
536 if (!slot) {
4b25264da01b mke2fs: Stopping for dinner. It compiles.
Rob Landley <rob@landley.net>
parents: 82
diff changeset
537 if (j) xwrite(TT.fsfd, bg, TT.blocksize);
82
612c8d6c2829 More work on mke2fs.
Rob Landley <rob@landley.net>
parents: 81
diff changeset
538 memset(bg, 0, TT.blocksize);
612c8d6c2829 More work on mke2fs.
Rob Landley <rob@landley.net>
parents: 81
diff changeset
539 }
612c8d6c2829 More work on mke2fs.
Rob Landley <rob@landley.net>
parents: 81
diff changeset
540
105
c5b6fb1fe3a4 Calculate block and inode usage in group table and bitmaps.
Rob Landley <rob@landley.net>
parents: 104
diff changeset
541 // How many free inodes in this group?
99
97d717829ff0 More work on mke2fs.c. Random in-progress snapshot...
Rob Landley <rob@landley.net>
parents: 97
diff changeset
542 temp = TT.inodespg;
84
bdbef4ab4ac6 This creates an almost valid empty ext2 filesystem, except for a few superblock
Rob Landley <rob@landley.net>
parents: 83
diff changeset
543 if (!i) temp -= INODES_RESERVED;
105
c5b6fb1fe3a4 Calculate block and inode usage in group table and bitmaps.
Rob Landley <rob@landley.net>
parents: 104
diff changeset
544 if (temp > treeinodes) {
c5b6fb1fe3a4 Calculate block and inode usage in group table and bitmaps.
Rob Landley <rob@landley.net>
parents: 104
diff changeset
545 treeinodes -= temp;
c5b6fb1fe3a4 Calculate block and inode usage in group table and bitmaps.
Rob Landley <rob@landley.net>
parents: 104
diff changeset
546 temp = 0;
c5b6fb1fe3a4 Calculate block and inode usage in group table and bitmaps.
Rob Landley <rob@landley.net>
parents: 104
diff changeset
547 } else {
c5b6fb1fe3a4 Calculate block and inode usage in group table and bitmaps.
Rob Landley <rob@landley.net>
parents: 104
diff changeset
548 temp -= treeinodes;
c5b6fb1fe3a4 Calculate block and inode usage in group table and bitmaps.
Rob Landley <rob@landley.net>
parents: 104
diff changeset
549 treeinodes = 0;
c5b6fb1fe3a4 Calculate block and inode usage in group table and bitmaps.
Rob Landley <rob@landley.net>
parents: 104
diff changeset
550 }
83
4b25264da01b mke2fs: Stopping for dinner. It compiles.
Rob Landley <rob@landley.net>
parents: 82
diff changeset
551 bg[slot].free_inodes_count = SWAP_LE16(temp);
82
612c8d6c2829 More work on mke2fs.
Rob Landley <rob@landley.net>
parents: 81
diff changeset
552
105
c5b6fb1fe3a4 Calculate block and inode usage in group table and bitmaps.
Rob Landley <rob@landley.net>
parents: 104
diff changeset
553 // How many free blocks in this group?
99
97d717829ff0 More work on mke2fs.c. Random in-progress snapshot...
Rob Landley <rob@landley.net>
parents: 97
diff changeset
554 temp = TT.inodespg/(TT.blocksize/sizeof(struct ext2_inode)) + 2;
84
bdbef4ab4ac6 This creates an almost valid empty ext2 filesystem, except for a few superblock
Rob Landley <rob@landley.net>
parents: 83
diff changeset
555 temp = end-used-temp;
105
c5b6fb1fe3a4 Calculate block and inode usage in group table and bitmaps.
Rob Landley <rob@landley.net>
parents: 104
diff changeset
556 if (temp > treeblocks) {
c5b6fb1fe3a4 Calculate block and inode usage in group table and bitmaps.
Rob Landley <rob@landley.net>
parents: 104
diff changeset
557 treeblocks -= temp;
c5b6fb1fe3a4 Calculate block and inode usage in group table and bitmaps.
Rob Landley <rob@landley.net>
parents: 104
diff changeset
558 temp = 0;
c5b6fb1fe3a4 Calculate block and inode usage in group table and bitmaps.
Rob Landley <rob@landley.net>
parents: 104
diff changeset
559 } else {
c5b6fb1fe3a4 Calculate block and inode usage in group table and bitmaps.
Rob Landley <rob@landley.net>
parents: 104
diff changeset
560 temp -= treeblocks;
c5b6fb1fe3a4 Calculate block and inode usage in group table and bitmaps.
Rob Landley <rob@landley.net>
parents: 104
diff changeset
561 treeblocks = 0;
c5b6fb1fe3a4 Calculate block and inode usage in group table and bitmaps.
Rob Landley <rob@landley.net>
parents: 104
diff changeset
562 }
83
4b25264da01b mke2fs: Stopping for dinner. It compiles.
Rob Landley <rob@landley.net>
parents: 82
diff changeset
563 bg[slot].free_blocks_count = SWAP_LE32(temp);
4b25264da01b mke2fs: Stopping for dinner. It compiles.
Rob Landley <rob@landley.net>
parents: 82
diff changeset
564
105
c5b6fb1fe3a4 Calculate block and inode usage in group table and bitmaps.
Rob Landley <rob@landley.net>
parents: 104
diff changeset
565 // Fill out rest of group structure
104
1c2f6d2e25de Precalculate block and inode usage given a starting file tree. This compiles,
Rob Landley <rob@landley.net>
parents: 101
diff changeset
566 used += j*TT.blockbits;
83
4b25264da01b mke2fs: Stopping for dinner. It compiles.
Rob Landley <rob@landley.net>
parents: 82
diff changeset
567 bg[slot].block_bitmap = SWAP_LE32(used++);
4b25264da01b mke2fs: Stopping for dinner. It compiles.
Rob Landley <rob@landley.net>
parents: 82
diff changeset
568 bg[slot].inode_bitmap = SWAP_LE32(used++);
4b25264da01b mke2fs: Stopping for dinner. It compiles.
Rob Landley <rob@landley.net>
parents: 82
diff changeset
569 bg[slot].inode_table = SWAP_LE32(used);
4b25264da01b mke2fs: Stopping for dinner. It compiles.
Rob Landley <rob@landley.net>
parents: 82
diff changeset
570 bg[slot].used_dirs_count = 0; // (TODO)
82
612c8d6c2829 More work on mke2fs.
Rob Landley <rob@landley.net>
parents: 81
diff changeset
571 }
83
4b25264da01b mke2fs: Stopping for dinner. It compiles.
Rob Landley <rob@landley.net>
parents: 82
diff changeset
572 xwrite(TT.fsfd, bg, TT.blocksize);
4b25264da01b mke2fs: Stopping for dinner. It compiles.
Rob Landley <rob@landley.net>
parents: 82
diff changeset
573 }
4b25264da01b mke2fs: Stopping for dinner. It compiles.
Rob Landley <rob@landley.net>
parents: 82
diff changeset
574
4b25264da01b mke2fs: Stopping for dinner. It compiles.
Rob Landley <rob@landley.net>
parents: 82
diff changeset
575 // Now write out stuff that every block group has.
4b25264da01b mke2fs: Stopping for dinner. It compiles.
Rob Landley <rob@landley.net>
parents: 82
diff changeset
576
105
c5b6fb1fe3a4 Calculate block and inode usage in group table and bitmaps.
Rob Landley <rob@landley.net>
parents: 104
diff changeset
577 // Write block usage bitmap
83
4b25264da01b mke2fs: Stopping for dinner. It compiles.
Rob Landley <rob@landley.net>
parents: 82
diff changeset
578
105
c5b6fb1fe3a4 Calculate block and inode usage in group table and bitmaps.
Rob Landley <rob@landley.net>
parents: 104
diff changeset
579 start += 2 + itable;
83
4b25264da01b mke2fs: Stopping for dinner. It compiles.
Rob Landley <rob@landley.net>
parents: 82
diff changeset
580 memset(toybuf, 0, TT.blocksize);
105
c5b6fb1fe3a4 Calculate block and inode usage in group table and bitmaps.
Rob Landley <rob@landley.net>
parents: 104
diff changeset
581 bits_set(toybuf, 0, start);
c5b6fb1fe3a4 Calculate block and inode usage in group table and bitmaps.
Rob Landley <rob@landley.net>
parents: 104
diff changeset
582 bits_set(toybuf, end, TT.blockbits-end);
c5b6fb1fe3a4 Calculate block and inode usage in group table and bitmaps.
Rob Landley <rob@landley.net>
parents: 104
diff changeset
583 temp = TT.treeblocks - usedblocks;
c5b6fb1fe3a4 Calculate block and inode usage in group table and bitmaps.
Rob Landley <rob@landley.net>
parents: 104
diff changeset
584 if (temp) {
c5b6fb1fe3a4 Calculate block and inode usage in group table and bitmaps.
Rob Landley <rob@landley.net>
parents: 104
diff changeset
585 if (end-start > temp) temp = end-start;
c5b6fb1fe3a4 Calculate block and inode usage in group table and bitmaps.
Rob Landley <rob@landley.net>
parents: 104
diff changeset
586 bits_set(toybuf, start, temp);
c5b6fb1fe3a4 Calculate block and inode usage in group table and bitmaps.
Rob Landley <rob@landley.net>
parents: 104
diff changeset
587 }
83
4b25264da01b mke2fs: Stopping for dinner. It compiles.
Rob Landley <rob@landley.net>
parents: 82
diff changeset
588 xwrite(TT.fsfd, toybuf, TT.blocksize);
4b25264da01b mke2fs: Stopping for dinner. It compiles.
Rob Landley <rob@landley.net>
parents: 82
diff changeset
589
105
c5b6fb1fe3a4 Calculate block and inode usage in group table and bitmaps.
Rob Landley <rob@landley.net>
parents: 104
diff changeset
590 // Write inode bitmap
83
4b25264da01b mke2fs: Stopping for dinner. It compiles.
Rob Landley <rob@landley.net>
parents: 82
diff changeset
591 memset(toybuf, 0, TT.blocksize);
105
c5b6fb1fe3a4 Calculate block and inode usage in group table and bitmaps.
Rob Landley <rob@landley.net>
parents: 104
diff changeset
592 j = 0;
c5b6fb1fe3a4 Calculate block and inode usage in group table and bitmaps.
Rob Landley <rob@landley.net>
parents: 104
diff changeset
593 if (!i) bits_set(toybuf, 0, j = INODES_RESERVED);
c5b6fb1fe3a4 Calculate block and inode usage in group table and bitmaps.
Rob Landley <rob@landley.net>
parents: 104
diff changeset
594 bits_set(toybuf, TT.inodespg, slot = TT.blockbits-TT.inodespg);
c5b6fb1fe3a4 Calculate block and inode usage in group table and bitmaps.
Rob Landley <rob@landley.net>
parents: 104
diff changeset
595 temp = TT.treeinodes - usedinodes;
c5b6fb1fe3a4 Calculate block and inode usage in group table and bitmaps.
Rob Landley <rob@landley.net>
parents: 104
diff changeset
596 if (temp) {
c5b6fb1fe3a4 Calculate block and inode usage in group table and bitmaps.
Rob Landley <rob@landley.net>
parents: 104
diff changeset
597 if (slot-j > temp) temp = slot-j;
c5b6fb1fe3a4 Calculate block and inode usage in group table and bitmaps.
Rob Landley <rob@landley.net>
parents: 104
diff changeset
598 bits_set(toybuf, j, temp);
c5b6fb1fe3a4 Calculate block and inode usage in group table and bitmaps.
Rob Landley <rob@landley.net>
parents: 104
diff changeset
599 }
83
4b25264da01b mke2fs: Stopping for dinner. It compiles.
Rob Landley <rob@landley.net>
parents: 82
diff changeset
600 xwrite(TT.fsfd, toybuf, TT.blocksize);
4b25264da01b mke2fs: Stopping for dinner. It compiles.
Rob Landley <rob@landley.net>
parents: 82
diff changeset
601
105
c5b6fb1fe3a4 Calculate block and inode usage in group table and bitmaps.
Rob Landley <rob@landley.net>
parents: 104
diff changeset
602 // Write inode table for this group (TODO)
99
97d717829ff0 More work on mke2fs.c. Random in-progress snapshot...
Rob Landley <rob@landley.net>
parents: 97
diff changeset
603 for (j = 0; j<TT.inodespg; j++) {
83
4b25264da01b mke2fs: Stopping for dinner. It compiles.
Rob Landley <rob@landley.net>
parents: 82
diff changeset
604 slot = j % (TT.blocksize/sizeof(struct ext2_inode));
4b25264da01b mke2fs: Stopping for dinner. It compiles.
Rob Landley <rob@landley.net>
parents: 82
diff changeset
605 if (!slot) {
105
c5b6fb1fe3a4 Calculate block and inode usage in group table and bitmaps.
Rob Landley <rob@landley.net>
parents: 104
diff changeset
606 if (j) xwrite(TT.fsfd, in, TT.blocksize);
83
4b25264da01b mke2fs: Stopping for dinner. It compiles.
Rob Landley <rob@landley.net>
parents: 82
diff changeset
607 memset(in, 0, TT.blocksize);
4b25264da01b mke2fs: Stopping for dinner. It compiles.
Rob Landley <rob@landley.net>
parents: 82
diff changeset
608 }
112
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
609 if (!i && j<INODES_RESERVED) {
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
610 // Write root inode
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
611 if (j == 2) fill_inode(in+slot, dtb);
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
612 } else if (dti) {
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
613 fill_inode(in+slot, dti);
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
614 dti = treenext(dti);
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
615 }
83
4b25264da01b mke2fs: Stopping for dinner. It compiles.
Rob Landley <rob@landley.net>
parents: 82
diff changeset
616 }
4b25264da01b mke2fs: Stopping for dinner. It compiles.
Rob Landley <rob@landley.net>
parents: 82
diff changeset
617 xwrite(TT.fsfd, in, TT.blocksize);
84
bdbef4ab4ac6 This creates an almost valid empty ext2 filesystem, except for a few superblock
Rob Landley <rob@landley.net>
parents: 83
diff changeset
618
112
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
619 while (dtb) {
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
620 // TODO write index data block
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
621 // TODO write root directory data block
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
622 // TODO write directory data block
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
623 // TODO write file data block
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
624 put_zeroes(TT.blocksize);
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
625 start++;
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
626 if (start == end) break;
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
627 }
aadd28817955 Next iteration of mke2fs development.
Rob Landley <rob@landley.net>
parents: 105
diff changeset
628 // Write data blocks (TODO)
99
97d717829ff0 More work on mke2fs.c. Random in-progress snapshot...
Rob Landley <rob@landley.net>
parents: 97
diff changeset
629 put_zeroes((end-start) * TT.blocksize);
82
612c8d6c2829 More work on mke2fs.
Rob Landley <rob@landley.net>
parents: 81
diff changeset
630 }
53
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on.
Rob Landley <rob@landley.net>
parents:
diff changeset
631 }