From nobody Tue Aug 1 20:17:24 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RFmcQ5FVpz4ppRd; Tue, 1 Aug 2023 20:17:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RFmcP6rgsz3HDB; Tue, 1 Aug 2023 20:17:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690921046; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AnfQzh4EfLmonD1Lr9k4qPOzq2AMRp2XDtf7dq5UJ7Y=; b=PmJYdXKJJVXLUikpV9iA+eSAj3J9LT51ZdJwXPGjqby5UXu5O2sGLA+z+bkid9YPyqbuqX 2EJ0XyduKsQcm079PjGQDdFF0YOKWbBMB6jJlZlkO7ALPbP7SA5TGatWf/5uG1+fEuz5dz D1WFIX3knUTaqT2RnyG8gYZntrUTNbY2O9wvQgP2m4D5Za7hfuyHx4ondkCUa9B/bckTu8 1/jhK+tBrvnKAH4XxBNWSmuKRRvabto2Ut8OuPIE430Xz33wtRaNRb0CH2fr+KHEk+COVG BHsYXLpmd2ezLdtP8IQiIY6Vt2SiQwdcRwNGwjFq5bOzLDooIaRkoZD58Nmbhg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690921046; a=rsa-sha256; cv=none; b=LUtXJCX+GpaDfvjkmGpyPLJW/JL79VwS+eKrzABXrzh2g8DHrHG3/C5spDp9SDmuQEseiY y5fT2OQ62V10nqC4jv6TPmFLh1H/5Fj/ca/3CK8gHpXA8NAQvtvqluzxyl0dzkGYp9qru3 vpKJf4CQvavfmzPqg0eVk82Kn/ZKV3Y+2GjIUdv2JPdOyhw9wzcOzuN8QxBNoxW+dfWwz1 tERd2xNPJmhGkGN19uD9/yUw5I6TShGPCJPsVdy1SjfoxAPEwluu5u02M1cKZOlKwq5fhK DmJxl/tOQHzyztG5AFEx24EFK8hjqf2gy23HQ8+IFTXBpbV4IYPb4Rwc8L8/1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690921046; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AnfQzh4EfLmonD1Lr9k4qPOzq2AMRp2XDtf7dq5UJ7Y=; b=csuM4XMUqzaEhlfCNlobtcYBS3fHRs+0UbH4bk0yA/9x6W3rR7FxS28U7/Xjn3NINsGi5m Zn/xZr2C4TwUDeQl6kQKCWk2eh0ZnYnM5UcCcbBGQBdb6k++BgpBjRC05uB4VNjp405bL+ jntjLifYr4EVGJtYwmywg486PcbvJe9LXr5e7bCi9Knou5y0GF7qeeGHZ7N7CD0jdZIHwA 7H3Yy7cZqvhozL4Z65KkGTaOWlQYmpa+7xdfrwFbzqzQLgVYqcFPtHL+y6gU7C6GHBzKQ6 k9qbsUziMmf4BBA7dkfvogG7mbGNKVZ6p1dp7Yg4nv9lW44NgIV1tp2z6s4tTA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RFmcP3FzdzrXY; Tue, 1 Aug 2023 20:17:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 371KHOCP030731; Tue, 1 Aug 2023 20:17:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371KHOEO030730; Tue, 1 Aug 2023 20:17:24 GMT (envelope-from git) Date: Tue, 1 Aug 2023 20:17:24 GMT Message-Id: <202308012017.371KHOEO030730@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kirk McKusick Subject: git: 344b5bf82528 - main - Support background fsck_ffs(8) on filesystems using journaled soft updates List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 344b5bf82528575ada304f0df356d2f045772328 Auto-Submitted: auto-generated The branch main has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=344b5bf82528575ada304f0df356d2f045772328 commit 344b5bf82528575ada304f0df356d2f045772328 Author: Kirk McKusick AuthorDate: 2023-08-01 20:16:11 +0000 Commit: Kirk McKusick CommitDate: 2023-08-01 20:17:02 +0000 Support background fsck_ffs(8) on filesystems using journaled soft updates An earlier addition of code to fsck_ffs(8) allowed it to support snapshots when running with journalled soft updates. Further functionality has now been added to fsck_ffs(8) to allow it to use snapshots to run in background on live filesystems running with journaled soft updates. This commit enables the use of this functionality. Tested-by: Peter Holm Sponsored-by: The FreeBSD Foundation MFC-after: 2 weeks --- sbin/fsck_ffs/main.c | 19 +++++++++++-------- sbin/fsck_ffs/suj.c | 25 +++++++++++++++++++------ 2 files changed, 30 insertions(+), 14 deletions(-) diff --git a/sbin/fsck_ffs/main.c b/sbin/fsck_ffs/main.c index 0acf7e709180..bfe2901c4053 100644 --- a/sbin/fsck_ffs/main.c +++ b/sbin/fsck_ffs/main.c @@ -274,9 +274,16 @@ checkfilesys(char *filesys) if (bkgrdcheck) { if (sbreadfailed) exit(3); /* Cannot read superblock */ - /* Earlier background failed or journaled */ - if (sblock.fs_flags & (FS_NEEDSFSCK | FS_SUJ)) - exit(4); + if ((sblock.fs_flags & FS_NEEDSFSCK) == FS_NEEDSFSCK) + exit(4); /* Earlier background failed */ + if ((sblock.fs_flags & FS_SUJ) == FS_SUJ) { + maxino = sblock.fs_ncg * sblock.fs_ipg; + maxfsblock = sblock.fs_size; + bufinit(); + preen = 1; + if (suj_check(filesys) == 0) + exit(4); /* Journal good, run it now */ + } if ((sblock.fs_flags & FS_DOSOFTDEP) == 0) exit(5); /* Not running soft updates */ size = MIBSIZE; @@ -350,7 +357,7 @@ checkfilesys(char *filesys) /* * Determine if we can and should do journal recovery. */ - if ((sblock.fs_flags & FS_SUJ) == FS_SUJ) { + if (bkgrdflag == 0 && (sblock.fs_flags & FS_SUJ) == FS_SUJ) { if ((sblock.fs_flags & FS_NEEDSFSCK) != FS_NEEDSFSCK && skipclean) { sujrecovery = 1; @@ -619,10 +626,6 @@ setup_bkgrdchk(struct statfs *mntp, int sbreadfailed, char **filesys) pwarn("FULL FSCK NEEDED, CANNOT RUN IN BACKGROUND\n"); return (0); } - if ((sblock.fs_flags & FS_SUJ) != 0) { - pwarn("JOURNALED FILESYSTEM, CANNOT RUN IN BACKGROUND\n"); - return (0); - } if (skipclean && ckclean && (sblock.fs_flags & (FS_UNCLEAN|FS_NEEDSFSCK)) == 0) { /* diff --git a/sbin/fsck_ffs/suj.c b/sbin/fsck_ffs/suj.c index e55e3fb1c782..b78123b59678 100644 --- a/sbin/fsck_ffs/suj.c +++ b/sbin/fsck_ffs/suj.c @@ -2135,7 +2135,9 @@ suj_verifyino(union dinode *dp) } if (DIP(dp, di_modrev) != fs->fs_mtime) { - printf("Journal timestamp does not match fs mount time\n"); + if (!bkgrdcheck || debug) + printf("Journal timestamp does not match " + "fs mount time\n"); return (-1); } @@ -2436,7 +2438,9 @@ suj_check(const char *filesys) sujino = idesc.id_parent; irelse(&ip); } else { - printf("Journal inode removed. Use tunefs to re-create.\n"); + if (!bkgrdcheck || debug) + printf("Journal inode removed. " + "Use tunefs to re-create.\n"); sblock.fs_flags &= ~FS_SUJ; sblock.fs_sujfree = 0; irelse(&ip); @@ -2447,7 +2451,8 @@ suj_check(const char *filesys) */ ginode(sujino, &ip); jip = ip.i_dp; - printf("** SU+J Recovering %s\n", filesys); + if (!bkgrdcheck || debug) + printf("** SU+J Recovering %s\n", filesys); if (suj_verifyino(jip) != 0 || (!preen && !reply("USE JOURNAL"))) { irelse(&ip); return (-1); @@ -2456,15 +2461,23 @@ suj_check(const char *filesys) * Build a list of journal blocks in jblocks before parsing the * available journal blocks in with suj_read(). */ - printf("** Reading %jd byte journal from inode %ju.\n", - DIP(jip, di_size), (uintmax_t)sujino); + if (!bkgrdcheck || debug) + printf("** Reading %jd byte journal from inode %ju.\n", + DIP(jip, di_size), (uintmax_t)sujino); suj_jblocks = jblocks_create(); blocks = ino_visit(jip, sujino, suj_add_block, 0); if (blocks != numfrags(fs, DIP(jip, di_size))) { - printf("Sparse journal inode %ju.\n", (uintmax_t)sujino); + if (!bkgrdcheck || debug) + printf("Sparse journal inode %ju.\n", + (uintmax_t)sujino); irelse(&ip); return (-1); } + /* If journal is valid then do journal check rather than background */ + if (bkgrdcheck) { + irelse(&ip); + return (0); + } irelse(&ip); suj_read(); jblocks_destroy(suj_jblocks);