Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
Pull ext4 bug fixes from Theodore Ts'o:
"This update contains two bug fixes, both destined for the stable tree.
Perhaps the most important is one which fixes ext4 when used with file
systems originally formatted for use with ext3, but then later
converted to take advantage of ext4."
* tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
ext4: don't set i_flags in EXT4_IOC_SETFLAGS
ext4: fix the free blocks calculation for ext3 file systems w/ uninit_bg
+4
-5
+4
-4
fs/ext4/balloc.c
+4
-4
fs/ext4/balloc.c
···
90
90
* unusual file system layouts.
91
91
*/
92
92
if (ext4_block_in_group(sb, ext4_block_bitmap(sb, gdp), block_group)) {
93
-
block_cluster = EXT4_B2C(sbi, (start -
94
-
ext4_block_bitmap(sb, gdp)));
93
+
block_cluster = EXT4_B2C(sbi,
94
+
ext4_block_bitmap(sb, gdp) - start);
95
95
if (block_cluster < num_clusters)
96
96
block_cluster = -1;
97
97
else if (block_cluster == num_clusters) {
···
102
102
103
103
if (ext4_block_in_group(sb, ext4_inode_bitmap(sb, gdp), block_group)) {
104
104
inode_cluster = EXT4_B2C(sbi,
105
-
start - ext4_inode_bitmap(sb, gdp));
105
+
ext4_inode_bitmap(sb, gdp) - start);
106
106
if (inode_cluster < num_clusters)
107
107
inode_cluster = -1;
108
108
else if (inode_cluster == num_clusters) {
···
114
114
itbl_blk = ext4_inode_table(sb, gdp);
115
115
for (i = 0; i < sbi->s_itb_per_group; i++) {
116
116
if (ext4_block_in_group(sb, itbl_blk + i, block_group)) {
117
-
c = EXT4_B2C(sbi, start - itbl_blk + i);
117
+
c = EXT4_B2C(sbi, itbl_blk + i - start);
118
118
if ((c < num_clusters) || (c == inode_cluster) ||
119
119
(c == block_cluster) || (c == itbl_cluster))
120
120
continue;