未验证 提交 91cea8aa 编写于 作者: O openharmony_ci 提交者: Gitee

!1010 fix: 修复内核告警

Merge pull request !1010 from zhangdengyu/cherry-pick-1664183802
......@@ -581,8 +581,11 @@ static OsBcacheBlock *AllocNewBlock(OsBcache *bc, BOOL read, UINT64 num)
DelBlock(bc, prefer);
}
if (prefer->used) { /* do not combine with next check */
MergeSyncBlocks(bc, prefer); /* prefer->used may be changed here */
}
if (prefer->used) {
MergeSyncBlocks(bc, prefer);
BcacheSyncBlock(bc, prefer);
DelBlock(bc, prefer);
}
......
......@@ -260,7 +260,7 @@ int VnodeDrop(void)
static char *NextName(char *pos, uint8_t *len)
{
char *name = NULL;
while (*pos == '/') {
while (*pos != 0 && *pos == '/') {
pos++;
}
if (*pos == '\0') {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册