Commit 5d11fc79 authored by Theodore Ts'o's avatar Theodore Ts'o Committed by Greg Kroah-Hartman

ext4: Fix accounting of reserved metadata blocks

commit ee5f4d9c upstream (as of v2.6.33-rc3)

Commit 0637c6f4 had a typo which caused the reserved metadata blocks to
not be released correctly.   Fix this.
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent beb62f7a
...@@ -1118,9 +1118,9 @@ static void ext4_da_update_reserve_space(struct inode *inode, int used) ...@@ -1118,9 +1118,9 @@ static void ext4_da_update_reserve_space(struct inode *inode, int used)
* only when we have written all of the delayed * only when we have written all of the delayed
* allocation blocks. * allocation blocks.
*/ */
mdb_free = ei->i_allocated_meta_blocks; mdb_free = ei->i_reserved_meta_blocks;
ei->i_reserved_meta_blocks = 0;
percpu_counter_sub(&sbi->s_dirtyblocks_counter, mdb_free); percpu_counter_sub(&sbi->s_dirtyblocks_counter, mdb_free);
ei->i_allocated_meta_blocks = 0;
} }
spin_unlock(&EXT4_I(inode)->i_block_reservation_lock); spin_unlock(&EXT4_I(inode)->i_block_reservation_lock);
...@@ -1931,8 +1931,8 @@ static void ext4_da_release_space(struct inode *inode, int to_free) ...@@ -1931,8 +1931,8 @@ static void ext4_da_release_space(struct inode *inode, int to_free)
* only when we have written all of the delayed * only when we have written all of the delayed
* allocation blocks. * allocation blocks.
*/ */
to_free += ei->i_allocated_meta_blocks; to_free += ei->i_reserved_meta_blocks;
ei->i_allocated_meta_blocks = 0; ei->i_reserved_meta_blocks = 0;
} }
/* update fs dirty blocks counter */ /* update fs dirty blocks counter */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment