From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f176.google.com (mail-pg1-f176.google.com [209.85.215.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D36E9360EFA for ; Mon, 22 Jun 2026 07:34:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.176 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782113661; cv=none; b=NyLPD/fvszsC+y0Yhf1BRw0V7PuruvDw1ZdrVUPli4w0LdHuJVNlGEoeGiiIk9ggCRcbcvJq/mp3PRV3VHXpU5Cm0iEKqJaki91SB2Rrb3GqYQ08w9u44vy6rK5lyjtgU19x8eUHeWK5fjMB02DF3HGCQaAwM+RsU2d4EUhjHXQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782113661; c=relaxed/simple; bh=jD0DUuCbhoLyfZKBjoA4zOYt9GIEkGr9sD4B/7W2ry8=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=D7JGP+HglLUqSSpMVpe6dMmd8eRHpzwkHz/GDYYUhrSIpZnkWxg5xtJ9nEa0DQifRyeelGgm9RE+4+WXcYKg2+cGeKxfcN3Q+ZDxi/DGmoIK7go7r8GD4Ds0gKpIDA4lIY9P6CvqkOfELZqPNayBOsRS9QIfYANaRGl3nFSDixw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=G1XPGOeN; arc=none smtp.client-ip=209.85.215.176 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="G1XPGOeN" Received: by mail-pg1-f176.google.com with SMTP id 41be03b00d2f7-c890110acdaso1571755a12.3 for ; Mon, 22 Jun 2026 00:34:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782113658; x=1782718458; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=xsc6/cL+QBQi9eqFxKobfPmjzS1J21OTu3Lo5X9UYLc=; b=G1XPGOeN1ccr11QRmgSXuI9DnKmieJVjS6KXgvIL413IE/DthFahilb0E0RvMHp959 VSmiMWa9AbkOSWPpDFBHjCwrLR41YR9o+XBSVMWiYXZteZAop3+Ohi2SDWgO8MUNUSSj q67Dxl+oCO+aoB1WSimeDXOTPe2q8qLx0oEJFI/tOJXr0+4WUkJki8jstD9ryGgYAWe3 4PAM7B1OD+NgodXbWeGQ4QDzTVbjqoFyVQo9mo+EPNvlxWIwTaupDn7uZSGlUmIV82Rz OAaOnJgSZ8U7+dvO7Dwn3dJS4ji0btRa1oWvDXtZSHMXIHaUga6saLAlbtFc0VHpAdvB eIww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782113658; x=1782718458; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=xsc6/cL+QBQi9eqFxKobfPmjzS1J21OTu3Lo5X9UYLc=; b=m5JXhg0sicKlR1bZeVaMyS5TZ35ej5x4Hz2b46OJ8jpYuHW0nHBgUJpYCAfihnHB9Y IKQS55eFgLeRIcrL/Y46jIC+T9rMQz6eJO4FUca0UFvziYgnSHMCxOF7Ik5pNeegGe28 GMaLz0Nq+ujXiHniCJe3lW6RDlOARrdLrIuUQXhkNqvBOuLjrYGFmVJAcsJNQBkUHym/ hxw4eB3BjR2lzkcCdO1UaAyUWUsPyMhHrWVIexn/kf29hVqQPCSUorUfCcXMm6WnDe/x +Nej8FVBeqGwzHHew2noNirJzco2X82YVkkSY/0D5/rT1rTeChLXiZFZcLXScJR9RRyw l/FQ== X-Forwarded-Encrypted: i=1; AFNElJ880C1XAOjU8tcSWlPRd2PsEkNJPa8jZ1+fu5KgpSbgEJtXxcMJuGOmmEohvYGspQRju4d/RsXJCGuq9nA=@vger.kernel.org X-Gm-Message-State: AOJu0Yy8XTRpJ5cZuiQ1rjmfkg2zUNrjIDWzYdyL4hy1eHy0CkRK324P XIs7C636Fir6S8Gym6fVI1A/HWYUJ/dW58LXYHUEPVnMvHuT22bMNU7L X-Gm-Gg: AfdE7cnM9C9vrl+FqZYPrUtTbDH5FXxL5+ClAr+TtEWpH+WGxA6Iw/63ga4gqD7Pduh 9byrCgjCaWtKCYrJmfKMBBmnzMg+OxUnfuW4jrYXMgSnrG4UfinOlp8heOgp2QkKouT2k4I0NTW IeiltQieQrZT7VYONyihYEAIS7J8qJ1jJfyP2auKDvXmXf7un5/1jlsg9UdEk31zAOijJ+0vdVs m5RahJvY59OUSRqYZBskJAZVGfCsfa1fHIR3lOixFUXK/OhoWZ7ETYB7YL964F9DL+CZ1ZQSQFn lROUPeZnXDHRptT8vI5lWJmHMVuEod9ghrN9WEiH2zQiAM92sMAb2jP3PjI53/JwXYrfJfKeKJo YeMAbXdwhUEWOWRwIwZfW+x3KVFyRUjlc2TTajzgW6W6EC1y7qKyY32fuArHaOMkEfSrZZXu/aX LVlLlsr0ncC0CnnEg3iOoQzJ8= X-Received: by 2002:a05:6a00:3c81:b0:842:80c5:c420 with SMTP id d2e1a72fcca58-845625b3e08mr9637827b3a.40.1782113657890; Mon, 22 Jun 2026 00:34:17 -0700 (PDT) Received: from osman.mioffice.cn ([43.224.245.178]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-84564e9dab2sm6752777b3a.41.2026.06.22.00.34.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jun 2026 00:34:17 -0700 (PDT) From: Zhan Xusheng X-Google-Original-From: Zhan Xusheng To: Gao Xiang Cc: Chao Yu , linux-erofs@lists.ozlabs.org, linux-kernel@vger.kernel.org, Zhan Xusheng Subject: [PATCH] erofs: handle 48-bit blocks_hi for compressed inodes Date: Mon, 22 Jun 2026 15:34:10 +0800 Message-ID: <20260622073410.2934415-1-zhanxusheng@xiaomi.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Combine i_nb.blocks_hi with i_u.blocks_lo when computing inode->i_blocks for compressed inodes, mirroring the startblk_hi handling for unencoded inodes a few lines above. Also evaluate the shift in u64 to avoid truncation. Fixes: 2e1473d5195f ("erofs: implement 48-bit block addressing for unencoded inodes") Signed-off-by: Zhan Xusheng --- fs/erofs/inode.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/fs/erofs/inode.c b/fs/erofs/inode.c index a188c570087a..cf2f00e13cae 100644 --- a/fs/erofs/inode.c +++ b/fs/erofs/inode.c @@ -191,8 +191,9 @@ static int erofs_read_inode(struct inode *inode) err = -EFSCORRUPTED; goto err_out; } else { - inode->i_blocks = le32_to_cpu(copied.i_u.blocks_lo) << - (sb->s_blocksize_bits - 9); + inode->i_blocks = ((u64)le16_to_cpu(copied.i_nb.blocks_hi) << 32 | + le32_to_cpu(copied.i_u.blocks_lo)) << + (sb->s_blocksize_bits - 9); } if (vi->datalayout == EROFS_INODE_CHUNK_BASED) { -- 2.43.0