From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794257568; b=S6+EZ9Kcs3Gdr/4iPpCm5mGhdzYpohSsVFJQqjSsBsCst/ZyzkES7pmyA5BAxxu2IsvM 9DyAaXi88UjC0sFkH3calzFqcgJ10CNNwkWMax/7n1TjgJekW1VIKYp4v4KSUJZTcc8R+ Vm8xeS3IvtTgL6jn5INj+MVM1mSFBcZyj8r2MimKsAPNFCo79feGJUZdSt1ECNn4gxJtg JXvBvVaY3JS4oFem+hx9QnyQZhxpev9ichrtMAYzaCDJGPUa7N0dS3PvIDfrocZ8xG7Dk UJo3LL8kQx9vL3z9X/ddpFFp3UCN8wMatvwF7FCaiw47LAIhFwRCkkxND/hhEOeTjlw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794257568; h=Received:DKIM-Signature:Date:To:From:Subject:Message-Id; bh=58R8jGZ6rg7wwBhajyBcChNLzXBRoqspM19x3+DTpOg=; b=BmYBPsK/t3QQqH8d7MsPQXoirnDJHOeQCwI4JHH1LIdrhUIe6gDiq40H9Reb6U1W0ewX mmAz7Xw8ALEgcPpw6x7cvdMZVoGJnU38SforHIAm0s9VJL5FNO8wkP4J6SO4QuLXo3okD 2yoDtido0AVrWmSLrDPVClFQDh03XJO9VYlIFg777kqBQAQBt6BciqvlVaYAPwK/pwllD sQa4pxCjQdR4G5lQiQPGKfqG3/kZym1bhdmx1zJUAOgvFfSuxUZfIjMkzVP9ky1/nhafs TKEIzQ2/LcD8o90W0ggiMRQii3oaSnclpIXwB2nP3e7/Hv36BjmhUVtS329WTDeeJeQ== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linux-foundation.org header.i=@linux-foundation.org header.a=rsa-sha256 header.s=korg header.b=bxHC+YdA; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6F5D4606A31C for ; Mon, 9 Nov 2026 20:52:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.a=rsa-sha256 header.s=korg header.b=bxHC+YdA Received: by smtp.kernel.org (Postfix) with ESMTPSA id EF16B1F0089F; Mon, 9 Nov 2026 20:52:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux-foundation.org; s=korg; t=1794257568; bh=58R8jGZ6rg7wwBhajyBcChNLzXBRoqspM19x3+DTpOg=; h=Date:To:From:Subject; b=bxHC+YdAf4BeTBGH/S8K1tpQQ8DZdTO+GewiHxgLEKDpxeYs+hiowA6WfCFmeQkt9 Kftv/Aq4JbUJPA68EEz0Lav/0Uf4dMgGP8wdcmL3JlTWbEqo/OcDqDQavTQ3jrqnZ+ p6JlBLTuNGXELqF4jpPa1qwB39NPg65ovUnfx6WQ= Date: Mon, 09 Nov 2026 12:52:47 -0800 To: mm-commits@vger.kernel.org,joseph.qi@linux.alibaba.com, akpm@linux-foundation.org From: Andrew Morton Subject: + ocfs2-abstract-the-dinode-suballoc-slot-checks.patch added to mm-nonmm-unstable branch Message-Id: <20261109205247.EF16B1F0089F@smtp.kernel.org> X-Mailing-List: mm-commits@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list The patch titled Subject: ocfs2: abstract the dinode suballoc slot checks has been added to the -mm mm-nonmm-unstable branch. Its filename is ocfs2-abstract-the-dinode-suballoc-slot-checks.patch This patch will shortly appear at https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/ocfs2-abstract-the-dinode-suballoc-slot-checks.patch This patch will later appear in the mm-nonmm-unstable branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next via various branches at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm and is updated there most days ------------------------------------------------------ From: Joseph Qi Subject: ocfs2: abstract the dinode suballoc slot checks Date: Mon, 09 Nov 2026 20:20:56 +0800 The suballoc slot validation is a nested if/else-if whose two arms carry different error messages. Split it into two predicates so each message stays at its own call site without having to re-test the slot value to work out which arm fired. The arms were already mutually exclusive, so two sequential tests are equivalent to the if/else-if. Keep the OCFS2_INVALID_SLOT exclusion in the range predicate. OCFS2_INVALID_SLOT is 65535, which is greater than max_slots - 1, so without it every system inode mkfs.ocfs2 creates from the global allocator would be rejected. ocfs2_get_suballoc_slot_bit() in suballoc.c open-codes an identical range test, and is deliberately not converted. The dinode validator pairs the range predicate with ocfs2_dinode_has_invalid_suballoc_slot(), which also rejects OCFS2_INVALID_SLOT on a non-system inode, so that pair is stricter than what ocfs2_get_suballoc_slot_bit() accepts. The range predicate on its own is not stricter, it is the same test. No functional change intended. Link: https://lore.kernel.org/20261109122121.21473-7-joseph.qi@linux.alibaba.com Signed-off-by: Joseph Qi Signed-off-by: Andrew Morton Cc: Heming Zhao Cc: Mark Fasheh Cc: Joel Becker --- fs/ocfs2/inode.c | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) --- a/fs/ocfs2/inode.c~ocfs2-abstract-the-dinode-suballoc-slot-checks +++ a/fs/ocfs2/inode.c @@ -98,6 +98,19 @@ static bool ocfs2_dinode_has_wrong_fs_ge return le32_to_cpu(di->i_fs_generation) != OCFS2_SB(sb)->fs_generation; } +static bool ocfs2_dinode_has_invalid_suballoc_slot(struct ocfs2_dinode *di) +{ + return le16_to_cpu(di->i_suballoc_slot) == (u16)OCFS2_INVALID_SLOT && + !(le32_to_cpu(di->i_flags) & OCFS2_SYSTEM_FL); +} + +static bool ocfs2_dinode_has_out_of_range_suballoc_slot(struct super_block *sb, + struct ocfs2_dinode *di) +{ + return le16_to_cpu(di->i_suballoc_slot) != (u16)OCFS2_INVALID_SLOT && + (u32)le16_to_cpu(di->i_suballoc_slot) > OCFS2_SB(sb)->max_slots - 1; +} + static bool ocfs2_valid_inode_mode(umode_t mode) { return fs_umode_to_ftype(mode) != FT_UNKNOWN; @@ -1564,15 +1577,15 @@ int ocfs2_validate_inode_block(struct su * deleting it would pass the slot to get_local_system_inode() via * ocfs2_remove_inode() and trigger BUG_ON(slot == OCFS2_INVALID_SLOT). */ - if (le16_to_cpu(di->i_suballoc_slot) == (u16)OCFS2_INVALID_SLOT) { - if (!(le32_to_cpu(di->i_flags) & OCFS2_SYSTEM_FL)) { - rc = ocfs2_error(sb, - "Invalid dinode %llu: suballoc slot %u for non-system inode\n", - (unsigned long long)bh->b_blocknr, - le16_to_cpu(di->i_suballoc_slot)); - goto bail; - } - } else if ((u32)le16_to_cpu(di->i_suballoc_slot) > OCFS2_SB(sb)->max_slots - 1) { + if (ocfs2_dinode_has_invalid_suballoc_slot(di)) { + rc = ocfs2_error(sb, + "Invalid dinode %llu: suballoc slot %u for non-system inode\n", + (unsigned long long)bh->b_blocknr, + le16_to_cpu(di->i_suballoc_slot)); + goto bail; + } + + if (ocfs2_dinode_has_out_of_range_suballoc_slot(sb, di)) { rc = ocfs2_error(sb, "Invalid dinode %llu: suballoc slot %u\n", (unsigned long long)bh->b_blocknr, le16_to_cpu(di->i_suballoc_slot)); _ Patches currently in -mm which might be from joseph.qi@linux.alibaba.com are ocfs2-exempt-orphaned-dinodes-from-the-zero-nlink-check.patch ocfs2-abstract-the-zero-nlink-or-mode-dinode-check.patch ocfs2-abstract-the-dinode-i_blkno-mismatch-check.patch ocfs2-abstract-the-dinode-ocfs2_valid_fl-check.patch ocfs2-abstract-the-dinode-fs_generation-mismatch-check.patch ocfs2-abstract-the-dinode-suballoc-slot-checks.patch ocfs2-abstract-the-dinode-suballoc-bit-check.patch ocfs2-abstract-the-dinode-orphaned-slot-check.patch ocfs2-abstract-the-dinode-dio-orphaned-slot-check.patch ocfs2-abstract-the-inline-data-dinode-guard-and-cluster-check.patch ocfs2-abstract-the-inline-data-id_count-bound-check.patch ocfs2-abstract-the-inline-data-i_size-bound-check.patch ocfs2-abstract-the-fast-symlink-dinode-guard-and-size-check.patch ocfs2-abstract-the-fast-symlink-nul-termination-check.patch ocfs2-abstract-the-chain-list-dinode-guard-and-count-check.patch ocfs2-abstract-the-chain-list-next-free-record-check.patch ocfs2-abstract-the-chain-list-bits-per-cluster-check.patch ocfs2-abstract-the-dinode-refcount-location-check.patch ocfs2-abstract-the-zero-extent-list-count-check.patch ocfs2-abstract-the-oversized-extent-list-count-check.patch ocfs2-abstract-the-extent-list-next-free-record-check.patch ocfs2-report-unrepairable-corruption-from-online-filecheck-fix.patch ocfs2-check-dinode-nlink-and-mode-in-online-filecheck.patch ocfs2-check-dinode-suballoc-slot-in-online-filecheck.patch ocfs2-check-dinode-suballoc-bit-in-online-filecheck.patch ocfs2-check-dinode-orphaned-slots-in-online-filecheck.patch ocfs2-check-inline-data-dinodes-in-online-filecheck.patch ocfs2-check-fast-symlink-dinodes-in-online-filecheck.patch ocfs2-check-chain-list-dinodes-in-online-filecheck.patch ocfs2-check-dinode-refcount-location-in-online-filecheck.patch ocfs2-check-extent-list-dinodes-in-online-filecheck.patch