1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
|
This patch fixes up the computation of nbinodes which would go
negative due to an int overflow issue when nbblocks > 2Meg for
a 2Gig or greater filesystem.
The computation is now done as a float equation, since both nbblocks
and bytes_per_inode are no floats, and then cast to int by assignment.
int tmp_nbinodes = nbblocks * BLOCKSIZE / bytes_per_inode;
Upstream-Status: Submitted
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Rebased by Dexuan Cui <dexuan.cui@intel.com>
Index: genext2fs-1.4.1/genext2fs.c
===================================================================
--- a/genext2fs.c 2012-03-29 00:07:20.308856017 +0800
+++ b/genext2fs.c 2012-03-29 00:09:06.848856005 +0800
@@ -3041,7 +3041,7 @@
int
main(int argc, char **argv)
{
- int nbblocks = -1;
+ float nbblocks = -1;
int nbinodes = -1;
int nbresrvd = -1;
float bytes_per_inode = -1;
@@ -3203,7 +3203,7 @@
}
if(fs_timestamp == -1)
fs_timestamp = time(NULL);
- fs = init_fs(nbblocks, nbinodes, nbresrvd, holes, fs_timestamp,
+ fs = init_fs((int)nbblocks, nbinodes, nbresrvd, holes, fs_timestamp,
bigendian, fsout);
}
if (volumelabel != NULL)
|
