ext4: don't release reserved space for previously allocated cluster

When xfstests' auto group is run on a bigalloc filesystem with a
4.0-rc3 kernel, e2fsck failures and kernel warnings occur for some
tests. e2fsck reports incorrect iblocks values, and the warnings
indicate that the space reserved for delayed allocation is being
overdrawn at allocation time.

Some of these errors occur because the reserved space is incorrectly
decreased by one cluster when ext4_ext_map_blocks satisfies an
allocation request by mapping an unused portion of a previously
allocated cluster.  Because a cluster's worth of reserved space was
already released when it was first allocated, it should not be released
again.

This patch appears to correct the e2fsck failure reported for
generic/232 and the kernel warnings produced by ext4/001, generic/009,
and generic/033.  Failures and warnings for some other tests remain to
be addressed.

Signed-off-by: Eric Whitney <enwlinux@gmail.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>

diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
index e5fafa7324c8e58d86cc6c0f660f89b8d3710519..74580ea3ab556e9b272457723310108b65cdb8af 100644 (file)
--- a/fs/ext4/extents.c
+++ b/fs/ext4/extents.c
@@ -4529,19 +4529,7 @@ got_allocated_blocks:
                 */
                reserved_clusters = get_reserved_cluster_alloc(inode,
                                                map->m_lblk, allocated);
-               if (map_from_cluster) {
-                       if (reserved_clusters) {
-                               /*
-                                * We have clusters reserved for this range.
-                                * But since we are not doing actual allocation
-                                * and are simply using blocks from previously
-                                * allocated cluster, we should release the
-                                * reservation and not claim quota.
-                                */
-                               ext4_da_update_reserve_space(inode,
-                                               reserved_clusters, 0);
-                       }
-               } else {
+               if (!map_from_cluster) {
                        BUG_ON(allocated_clusters < reserved_clusters);
                        if (reserved_clusters < allocated_clusters) {
                                struct ext4_inode_info *ei = EXT4_I(inode);