Commit 2ca49cf0 authored by Zhang Yi's avatar Zhang Yi Committed by sanglipeng
Browse files

ext4: correct the start block of counting reserved clusters 

stable inclusion
from stable-v5.10.202
commit 0932764fb54ac6a30c26000c329b1d1e3ba41039
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I9DZOS

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=0932764fb54ac6a30c26000c329b1d1e3ba41039



--------------------------------

commit 40ea98396a3659062267d1fe5f99af4f7e4f05e3 upstream.

When big allocate feature is enabled, we need to count and update
reserved clusters before removing a delayed only extent_status entry.
{init|count|get}_rsvd() have already done this, but the start block
number of this counting isn't correct in the following case.

  lblk            end
   |               |
   v               v
          -------------------------
          |                       | orig_es
          -------------------------
                   ^              ^
      len1 is 0    |     len2     |

If the start block of the orig_es entry founded is bigger than lblk, we
passed lblk as start block to count_rsvd(), but the length is correct,
finally, the range to be counted is offset. This patch fix this by
passing the start blocks to 'orig_es->lblk + len1'.

Signed-off-by: default avatarZhang Yi <yi.zhang@huawei.com>
Cc: stable@kernel.org
Link: https://lore.kernel.org/r/20230824092619.1327976-2-yi.zhang@huaweicloud.com


Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarsanglipeng <sanglipeng1@jd.com>
parent 4f5baa83

fs/ext4/extents_status.c

+2 −2
Original line number Diff line number Diff line
@@ -1366,8 +1366,8 @@ static int __es_remove_extent(struct inode *inode, ext4_lblk_t lblk, 
			}

		}

		if (count_reserved)

			count_rsvd(inode, lblk, orig_es.es_len - len1 - len2,

				   &orig_es, &rc);

			count_rsvd(inode, orig_es.es_lblk + len1,

				   orig_es.es_len - len1 - len2, &orig_es, &rc);

		goto out_get_reserved;

	}