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 4C5E6FD4613 for ; Thu, 26 Feb 2026 03:59:12 +0000 (UTC) Received: from boromir.ozlabs.org (localhost [127.0.0.1]) by lists.ozlabs.org (Postfix) with ESMTP id 4fLyPp40kzz2yFb; Thu, 26 Feb 2026 14:59:10 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; arc=none smtp.remote-ip="2607:f8b0:4864:20::649" ARC-Seal: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1772078350; cv=none; b=NwpfMG//DJ3fFtopaxxZ98nmwheM330Kk/8jCxTwxoe9galvhZ/MXGpntR7HzoqopTJLWajTLD3gRkEhwRdcM2s7MzfxrixN1gdNK5wHifctCC4HtV/vFmhnf/teFndf4TZK44EgHQm27ACsc2NyEIyKAxgp287cXaR+Q0kALTIMXhErJ/WuphlcBDhax7ZMKzmD4x/obUSr27vzUpZtt8J3W4qn2iGSV5oH2oZkJEh2PwzMhHoKO5cY2CwRRGLARBB6HX+GdCGMSmTmmzYQqgF4rwSVPP1F/jTv4ow0eNPxlWH/vBX7X/hdu0i+hCE7OP79xC6kb3O4J75am3a4Sg== ARC-Message-Signature: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1772078350; c=relaxed/relaxed; bh=X3z1s4R7WGggWbLTlFKPe7EWqNP/ePaVH5AZfRJoXLY=; h=Date:Mime-Version:Message-ID:Subject:From:To:Cc:Content-Type; b=BfT0kgB5cHch96gvBZAzm1Fxjs/TZ2TVXEMbYTAI6RG6XRpAw3oIKHbowqR8dyppOH4e08MhX25sxTtNl8qW+QbfxBH+KOaF5yDhCp1BFG4qGpv1XU3SqSe8zkTkOuzqogLNaqwLo/rVL5mpvmgeB2VMoaNdhDdfbzy/7uDsBSw6XkBcCgvN2JbK/kt+kLFiCO0ource9VifZp8N02Kz477rkhCV4xyQP4zxickbVac0zQn+3rCxEHYY44WClil7sKuKnNBkFe7KrFj5yENO6bhBC3TT67SgRolXjplXOAA937w016iDkqvx9ZiBx4ziqsCmbWOkaraX3PUzDSPDfQ== ARC-Authentication-Results: i=1; lists.ozlabs.org; dmarc=pass (p=reject dis=none) header.from=google.com; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20230601 header.b=LEj/F51A; dkim-atps=neutral; spf=pass (client-ip=2607:f8b0:4864:20::649; helo=mail-pl1-x649.google.com; envelope-from=3cswfaqykc2cnsxjtglttlqj.htrqnszc-jwtkxqnxyx.teqfgx.twl@flex--inseob.bounces.google.com; receiver=lists.ozlabs.org) smtp.mailfrom=flex--inseob.bounces.google.com Authentication-Results: lists.ozlabs.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20230601 header.b=LEj/F51A; dkim-atps=neutral Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=flex--inseob.bounces.google.com (client-ip=2607:f8b0:4864:20::649; helo=mail-pl1-x649.google.com; envelope-from=3cswfaqykc2cnsxjtglttlqj.htrqnszc-jwtkxqnxyx.teqfgx.twl@flex--inseob.bounces.google.com; receiver=lists.ozlabs.org) Received: from mail-pl1-x649.google.com (mail-pl1-x649.google.com [IPv6:2607:f8b0:4864:20::649]) (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 4fLyPn4PCRz2xQs for ; Thu, 26 Feb 2026 14:59:09 +1100 (AEDT) Received: by mail-pl1-x649.google.com with SMTP id d9443c01a7336-2aad5fec176so3466165ad.2 for ; Wed, 25 Feb 2026 19:59:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1772078346; x=1772683146; darn=lists.ozlabs.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=X3z1s4R7WGggWbLTlFKPe7EWqNP/ePaVH5AZfRJoXLY=; b=LEj/F51AXEnTU37mOr+W63Q0JxIBrv94yW9W085O3jQcwpLsD8DwUK74+2eh9jGhm5 nV5MnQoQHHRUl2GR4wmhcHTumI26AdVsPZmEMXtDnL9DFABKH3SWLU1sZx0TmUrQFGYX b3oHwncgQcM1J+EOZNQnxNN3fw7I/g4O/TTZ8vIjyLAkY3wipoZucLqwKHEzNizFd/zh SIWB3gPAXZ3HBhk/6icb2XI5FLaKP9yV1pLQgV4S4wDaLK6Z+nd7M/WPZf39MdkWnjVp 587pXuv2QSjMFDWr/s4yjT8jPDhdrKgDX6ql2qyWFh3EzlqWNXgN4qH08xYi+9YfDEJs FG7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772078346; x=1772683146; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=X3z1s4R7WGggWbLTlFKPe7EWqNP/ePaVH5AZfRJoXLY=; b=SzcWZG8Yxd+dLIeYdTqXK2qBIkC3zwl/usMRnksCaa7567sXxmbUo84xSmbE/sbV1J ZI62CvzxcmwKXJupPNTXil+RAj6+Y+jJ2qvIKOvJXZR7isE3Pqxa0Kl0tz010E3mG0Lc wdBFV7k6r7z1vdKfBBWIekjt+KzlFOncPwd9TMao3czwLAhyDbJnt2gvgML9xI/tz/w6 b7gXIQc06q3w+OO2pBsiuatc3oma4YgEiPhKg8GIR1BWxlrJeqd1E6/n77dGduFCfnUH PpW54+CsmF/Pv/7DOM+U7eWMJsFbXuhrEQDhYbpLpG8rcCMqtiZbRwVDVhQZzrZcL+h9 4PZA== X-Gm-Message-State: AOJu0Yx2cUKsc1aoW7bVveor3L1wZoZXcz4EQhpuaSAoLkopQ/ZS6ACN 9OwI07fuFvZrdNm/ozMjsyQIswTLW+O6KtyUlPn+ULiMAUnKdWS57VTgotJXiVPIpPOTEch8VDt nePWi/5pYIp/XHZkgGwA2LDuAEmdPQkCCBfUZIvDcfLMX/LcMCYA+LnS9/Dj+czeXd02h2MA+6u 20cAi3m4XrHBrjHtQ/zvyE34usQgJuVW9I7YmrNv6emFzM X-Received: from pgeh20.prod.google.com ([2002:a05:6a02:53d4:b0:c16:9e46:4810]) (user=inseob job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a21:9147:b0:366:584c:62ef with SMTP id adf61e73a8af0-39545fb9331mr15588552637.65.1772078346327; Wed, 25 Feb 2026 19:59:06 -0800 (PST) Date: Thu, 26 Feb 2026 12:58:58 +0900 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 X-Mailer: git-send-email 2.53.0.414.gf7e9f6c205-goog Message-ID: <20260226035858.3914840-1-inseob@google.com> Subject: [PATCH] erofs-utils: fsck: support extracting subtrees From: Inseob Kim To: linux-erofs@lists.ozlabs.org Cc: Inseob Kim Content-Type: text/plain; charset="UTF-8" Add --nid and --path options to fsck.erofs to allow users to check or extract specific sub-directories or files instead of the entire filesystem. This is useful for targeted data recovery or verifying specific image components without the overhead of a full traversal. Signed-off-by: Inseob Kim --- v2: retrieve pnid correctly rather than pnid == nid hack --- fsck/main.c | 82 +++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 73 insertions(+), 9 deletions(-) diff --git a/fsck/main.c b/fsck/main.c index ab697be..16cc627 100644 --- a/fsck/main.c +++ b/fsck/main.c @@ -39,6 +39,8 @@ struct erofsfsck_cfg { bool preserve_owner; bool preserve_perms; bool dump_xattrs; + erofs_nid_t nid; + const char *inode_path; bool nosbcrc; }; static struct erofsfsck_cfg fsckcfg; @@ -59,6 +61,8 @@ static struct option long_options[] = { {"offset", required_argument, 0, 12}, {"xattrs", no_argument, 0, 13}, {"no-xattrs", no_argument, 0, 14}, + {"nid", required_argument, 0, 15}, + {"path", required_argument, 0, 16}, {"no-sbcrc", no_argument, 0, 512}, {0, 0, 0, 0}, }; @@ -110,6 +114,8 @@ static void usage(int argc, char **argv) " --extract[=X] check if all files are well encoded, optionally\n" " extract to X\n" " --offset=# skip # bytes at the beginning of IMAGE\n" + " --nid=# check or extract from the target inode of nid #\n" + " --path=X check or extract from the target inode of path X\n" " --no-sbcrc bypass the superblock checksum verification\n" " --[no-]xattrs whether to dump extended attributes (default off)\n" "\n" @@ -245,6 +251,12 @@ static int erofsfsck_parse_options_cfg(int argc, char **argv) case 14: fsckcfg.dump_xattrs = false; break; + case 15: + fsckcfg.nid = (erofs_nid_t)atoll(optarg); + break; + case 16: + fsckcfg.inode_path = optarg; + break; case 512: fsckcfg.nosbcrc = true; break; @@ -862,6 +874,22 @@ again: return ret; } +struct erofsfsck_get_parent_ctx { + struct erofs_dir_context ctx; + erofs_nid_t pnid; +}; + +static int erofsfsck_get_parent_cb(struct erofs_dir_context *ctx) +{ + struct erofsfsck_get_parent_ctx *pctx = (void *)ctx; + + if (ctx->dot_dotdot && ctx->de_namelen == 2) { + pctx->pnid = ctx->de_nid; + return 1; + } + return 0; +} + static int erofsfsck_dirent_iter(struct erofs_dir_context *ctx) { int ret; @@ -1033,6 +1061,8 @@ int main(int argc, char *argv[]) fsckcfg.preserve_owner = fsckcfg.superuser; fsckcfg.preserve_perms = fsckcfg.superuser; fsckcfg.dump_xattrs = false; + fsckcfg.nid = 0; + fsckcfg.inode_path = NULL; err = erofsfsck_parse_options_cfg(argc, argv); if (err) { @@ -1068,22 +1098,56 @@ int main(int argc, char *argv[]) if (fsckcfg.extract_path) erofsfsck_hardlink_init(); - if (erofs_sb_has_fragments(&g_sbi) && g_sbi.packed_nid > 0) { - err = erofs_packedfile_init(&g_sbi, false); + if (fsckcfg.inode_path) { + struct erofs_inode inode = { .sbi = &g_sbi }; + + err = erofs_ilookup(fsckcfg.inode_path, &inode); if (err) { - erofs_err("failed to initialize packedfile: %s", - erofs_strerror(err)); + erofs_err("failed to lookup %s", fsckcfg.inode_path); goto exit_hardlink; } + fsckcfg.nid = inode.nid; + } else if (!fsckcfg.nid) { + fsckcfg.nid = g_sbi.root_nid; + } - err = erofsfsck_check_inode(g_sbi.packed_nid, g_sbi.packed_nid); - if (err) { - erofs_err("failed to verify packed file"); - goto exit_packedinode; + if (!fsckcfg.inode_path && fsckcfg.nid == g_sbi.root_nid) { + if (erofs_sb_has_fragments(&g_sbi) && g_sbi.packed_nid > 0) { + err = erofs_packedfile_init(&g_sbi, false); + if (err) { + erofs_err("failed to initialize packedfile: %s", + erofs_strerror(err)); + goto exit_hardlink; + } + + err = erofsfsck_check_inode(g_sbi.packed_nid, g_sbi.packed_nid); + if (err) { + erofs_err("failed to verify packed file"); + goto exit_packedinode; + } + } + } + + { + erofs_nid_t pnid = fsckcfg.nid; + + if (fsckcfg.nid != g_sbi.root_nid) { + struct erofs_inode inode = { .sbi = &g_sbi, .nid = fsckcfg.nid }; + + if (!erofs_read_inode_from_disk(&inode) && + S_ISDIR(inode.i_mode)) { + struct erofsfsck_get_parent_ctx ctx = { + .ctx.dir = &inode, + .ctx.cb = erofsfsck_get_parent_cb, + }; + + if (erofs_iterate_dir(&ctx.ctx, false) == 1) + pnid = ctx.pnid; + } } + err = erofsfsck_check_inode(pnid, fsckcfg.nid); } - err = erofsfsck_check_inode(g_sbi.root_nid, g_sbi.root_nid); if (fsckcfg.corrupted) { if (!fsckcfg.extract_path) erofs_err("Found some filesystem corruption"); -- 2.53.0.414.gf7e9f6c205-goog