From f12dd8bbe67778c59941067e2d9526659ffeb4c8 Mon Sep 17 00:00:00 2001
From: yinjiaming <yinjiaming@huawei.com>
Date: Thu, 14 Apr 2022 12:55:38 +0000
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dliteos=5Fm=E6=A0=B8=20?=
 =?UTF-8?q?=E5=86=85=E5=AD=98waterline=20=E7=BC=BA=E9=99=B7BUG=20=E3=80=90?=
 =?UTF-8?q?=E8=83=8C=E6=99=AF=E3=80=91=20OsMemWaterUsedRecord=E7=9A=84?=
 =?UTF-8?q?=E7=AC=AC=E4=BA=8C=E4=B8=AA=E5=8F=82=E6=95=B0=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=EF=BC=8C=E5=AF=BC=E8=87=B4waterline=E7=BB=9F=E8=AE=A1=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

【修改方案】
将OsMemWaterUsedRecord的第二个入参修改为
OS_MEM_NODE_GET_SIZE(node->sizeAndFlag) - nodeSize

【影响】
对现有的产品编译不会有影响

re #I4QBG2

Signed-off-by: yinjiaming <yinjiaming@huawei.com>
Change-Id: I1cc213d98230ec9723c6bf1871b4e46da3b3467d
---
 kernel/src/mm/los_memory.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/src/mm/los_memory.c b/kernel/src/mm/los_memory.c
index 19429965..65ad78d6 100644
--- a/kernel/src/mm/los_memory.c
+++ b/kernel/src/mm/los_memory.c
@@ -1487,7 +1487,7 @@ STATIC INLINE VOID OsMemMergeNodeForReAllocBigger(VOID *pool, UINT32 allocSize,
 #endif
     }
     OS_MEM_NODE_SET_USED_FLAG(node->sizeAndFlag);
-    OsMemWaterUsedRecord((struct OsMemPoolHead *)pool, node->sizeAndFlag - nodeSize);
+    OsMemWaterUsedRecord((struct OsMemPoolHead *)pool, OS_MEM_NODE_GET_SIZE(node->sizeAndFlag) - nodeSize);
 #if (LOSCFG_MEM_LEAKCHECK == 1)
     OsMemLinkRegisterRecord(node);
 #endif