From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A94D3FA0C42 for ; Wed, 15 Apr 2026 07:47:56 +0000 (UTC) Received: from boromir.ozlabs.org (localhost [127.0.0.1]) by lists.ozlabs.org (Postfix) with ESMTP id 4fwYCb11GZz2yvL; Wed, 15 Apr 2026 17:47:55 +1000 (AEST) Authentication-Results: lists.ozlabs.org; arc=none smtp.remote-ip=115.124.30.112 ARC-Seal: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1776239275; cv=none; b=NMNCZl+eppiI/6lVehdzdc3ajxtyCQrd33LgnFGQgL7/A0GsHO8Ri6PwrYpJ0gmDVgqLcQSkprc45zHscP7MXyymiV17GyrpZoyf5mQ+t3R0SH2LbRvjoh/oVjRNtpy26koVAT2tht6m0zTvv3x4Q7aUuQ8L2TPKWi05+B2hnbhoJ93h48lADaaMMbj9J+wQifcM+3Gfdo88n7zrRUcKzpy7R2kHlkzZuPWC+uZ4gxXQOk73xhjR5p0JbbvzxUEwzzZQp0uFqxZZprGKAG6B1/N4KBbe5TpQ0lcgJch4c6Psm0isyvCv3hbeDqb24OZjWBl1kd/WFowM010vADyWrQ== ARC-Message-Signature: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1776239275; c=relaxed/relaxed; bh=mqcFLVh0uZ3Bls1K6e7Ku75MvUv8IagPJc/SLA+nBnU=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=LOJYAJFtXk1iO+bBqsSpUOrLbx0iVSLAv7YjCpi8Y9RYMP+MWCJ0WviRksycqTxb8dyRSdt7XDEEeT9NntDdya02eANbLEcroqknDQpEBRnUAN9ayeJbmLEYVoFMPX799W3yseO3FpLwWmZA40szm9nP5pXdeZ+gccBsTScaDO4VS4nAXJ6uFTuI9XhVO76jrMWhcqEwPJwK8crZ3elRnjQtrdHSPXrM6crdDZsTAx+vtXICuEyf6qFFfpVrIj9JhOh/Ji5kJRIMn5Y8fc1js/us7mqaftrdz/DkckDRiNTj6TS1y+kB4cAp/iQJ1NE4+uy2YMbCVJgNDqk8e2p8UQ== ARC-Authentication-Results: i=1; lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=linux.alibaba.com; dkim=pass (1024-bit key; unprotected) header.d=linux.alibaba.com header.i=@linux.alibaba.com header.a=rsa-sha256 header.s=default header.b=sPEaroRu; dkim-atps=neutral; spf=pass (client-ip=115.124.30.112; helo=out30-112.freemail.mail.aliyun.com; envelope-from=hsiangkao@linux.alibaba.com; receiver=lists.ozlabs.org) smtp.mailfrom=linux.alibaba.com Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=linux.alibaba.com Authentication-Results: lists.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=linux.alibaba.com header.i=@linux.alibaba.com header.a=rsa-sha256 header.s=default header.b=sPEaroRu; dkim-atps=neutral Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=linux.alibaba.com (client-ip=115.124.30.112; helo=out30-112.freemail.mail.aliyun.com; envelope-from=hsiangkao@linux.alibaba.com; receiver=lists.ozlabs.org) Received: from out30-112.freemail.mail.aliyun.com (out30-112.freemail.mail.aliyun.com [115.124.30.112]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4fwYCX13xdz2yrM for ; Wed, 15 Apr 2026 17:47:50 +1000 (AEST) DKIM-Signature:v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1776239266; h=Message-ID:Date:MIME-Version:Subject:To:From:Content-Type; bh=mqcFLVh0uZ3Bls1K6e7Ku75MvUv8IagPJc/SLA+nBnU=; b=sPEaroRuxE3bpTdqPKBW+8GYB1kdW3W0nOUlfdfqKPSHEYZ6LDIpWQhoohgRkjOip85c2d6h9MmuWof3+IqIxJrLOB7K2TfYrghXySwrEUCK18h6x0w0zovQF5nxnaL3IbRaBWr3yfLWb+Mj8Hsgw+SLGe8MQgnr7TvwaNuszYA= X-Alimail-AntiSpam:AC=PASS;BC=-1|-1;BR=01201311R191e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=maildocker-contentspam033037033178;MF=hsiangkao@linux.alibaba.com;NM=1;PH=DS;RN=4;SR=0;TI=SMTPD_---0X13t8vd_1776239263; Received: from 30.221.132.134(mailfrom:hsiangkao@linux.alibaba.com fp:SMTPD_---0X13t8vd_1776239263 cluster:ay36) by smtp.aliyun-inc.com; Wed, 15 Apr 2026 15:47:44 +0800 Message-ID: Date: Wed, 15 Apr 2026 15:47:42 +0800 X-Mailing-List: linux-erofs@lists.ozlabs.org List-Id: List-Help: List-Owner: List-Post: List-Subscribe: , , List-Unsubscribe: Precedence: list MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v3 3/4] erofs-utils: mfks: add rebuild FULLDATA for combined EROFS images To: "zhaoyifan (H)" , Lucas Karpinski , linux-erofs@lists.ozlabs.org Cc: jcalmels@nvidia.com References: <20260414-merge-fs-v3-0-266bd1367fd2@nvidia.com> <20260414-merge-fs-v3-3-266bd1367fd2@nvidia.com> <3d420aa9-b123-4ba8-be3c-0b395dabb070@huawei.com> From: Gao Xiang In-Reply-To: <3d420aa9-b123-4ba8-be3c-0b395dabb070@huawei.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 2026/4/15 11:35, zhaoyifan (H) wrote: > This patch incorrectly handles inline inode: > > Reproduce in erofs-utils directory: >     mkfs/mkfs.erofs 1.erofs man/ >     mkfs/mkfs.erofs 2.erofs docs/ >     mkfs/mkfs.erofs --clean=data merged.erofs 1.erofs 2.erofs > > Then PERFORMANCE.md in merged.erofs contains incorrect data after offset 0x2000. > > Fixed with following diff: > > diff --git a/lib/inode.c b/lib/inode.c >   index bd10e26..36dce56 100644 >   --- a/lib/inode.c >   +++ b/lib/inode.c >   @@ -683,6 +683,13 @@ static int erofs_write_unencoded_data(struct erofs_inode *inode, > >         /* read the tail-end data */ >         if (inode->idata_size) { >   +             /* >   +              * If inode->idata is already present, the caller has prepared >   +              * the tail data and nothing more needs to be done here. >   +              */ >   +             if (inode->idata) >   +                     return 0; Yes, it should be fixed as: /* * Read the tail-end data if inode->idata is NULL; if the tail data * has been prepared then nothing more needs to be done here. */ if (inode->idata_size && !inode->idata) { } ... >> +#include "liberofs_cache.h" > Unnecessary include `liberofs_cache.h` That would be nice to be addressed too. I've applied [PATCH 1 and 2], could you send v4 to address this? Thanks, Gao Xiang