From nobody Sun Nov 12 06:48:48 2023 X-Original-To: dev-commits-src-all@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 4SSjns19xNz4yy8Q; Sun, 12 Nov 2023 06:48:49 +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 4SSjns0LzWz4M3N; Sun, 12 Nov 2023 06:48:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699771729; 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=cAfEh0op8wVXrNJCoXqjA8i1Edqb8ORwisACGnYeUz0=; b=mi9crLT6RbIG48ziuuEjoKrATpjqtxW7Z35Abf7UMX3ZrZ41eVlsiNNeACZ5ROlEhbKQEm d44ijeDdusIbXzklWotlw7sKg/qMUG8P5LKczTVvKJpIeTx9dJlbes8CxP1kucdajxj7ar nKcRyv5SuVn4KYoR8deU28VzoXpDS1HoYd6giArAZKGkUwByaZJtR+eD2ar5ZVN3U+0zK7 RYxC7cdSpzhmpGac9x1CYviak2J1sXOZopJ5ClJggVIo9rFDcbeDhTPK72EA1CF3vEc4Dn KO2vRtjHCQ0xQwy581Kg9ZWuzpS23MqQCBXCQQj+ltQS9htonbzRNwkOZ2tPkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699771729; 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=cAfEh0op8wVXrNJCoXqjA8i1Edqb8ORwisACGnYeUz0=; b=Ia4BRpZdyBjnwmqKXSKE1VfbUIx1luMrp6XNBi0ewtsDh6l0IDpTjsEwjku7b6wXk9xNhs /sTyR5C8jhEj+1es2i+1s5c4efrarVAZIjyJYTVwwr82wdVU75xdFnOgvqOBAIDIyyOl9Z 2UQAbij5Ep6oS6ICfKvOG041IxHM1mWM5m9TXdDdrv/CPIVKeFzi5LGJG9OtgqeWOc2nh4 d8WVQKb7clbkmfxyfW9bwJTvxh+awdLHvwzJhOL3JuVAtKc6Wsh8g6m1nfxmh7Es453u/3 m+lyUfc+EeBKy2eGOi/RDiTCCGE8icFPc9YvvrKyPI5zvPePZq/+ni2BMMmxwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699771729; a=rsa-sha256; cv=none; b=tExbnY0aBTFqU2VowsqFg5iR2CPCGQCyCgMqF5p9weYCrZ3PMOPG2cvMav8QFtqcYZDUne hCJZUanUPHW0FX5nE0475zJStAGurWlds2EjYe3IE5dWJ98BLBN1KgT+GETAU3GUNC5Rc4 lc9JMA6rqZr7POa8WL9TddBzWcJUQ5QdORJ7/al7CIcKS/sfANH82lQHA6gJc8TJxvzU/6 uDHe+dqCM/FAe2IFY2HNvC51pNNhqhUbvudifi/fZdhlMtYLCNF7DXjDbwK07C2miN16R8 bpj8msS05M19tDUmYz6CtFU9wzRIeECPnTbuVzwp8JXxKXh/5AVl9SnHsntE2A== 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 4SSjnr6WVmz1CFx; Sun, 12 Nov 2023 06:48:48 +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 3AC6mm9o092264; Sun, 12 Nov 2023 06:48:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AC6mmle092261; Sun, 12 Nov 2023 06:48:48 GMT (envelope-from git) Date: Sun, 12 Nov 2023 06:48:48 GMT Message-Id: <202311120648.3AC6mmle092261@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kirk McKusick Subject: git: 27133e6e86c1 - stable/14 - Delete snapshot after opening it when running fsck_ffs(9) in background. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 27133e6e86c16f86642a16d15ea2c910e9642616 Auto-Submitted: auto-generated The branch stable/14 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=27133e6e86c16f86642a16d15ea2c910e9642616 commit 27133e6e86c16f86642a16d15ea2c910e9642616 Author: Kirk McKusick AuthorDate: 2023-10-25 22:36:45 +0000 Commit: Kirk McKusick CommitDate: 2023-11-12 06:48:25 +0000 Delete snapshot after opening it when running fsck_ffs(9) in background. PR: 106107 (cherry picked from commit d3a36e4b7459b2d62c4cd50de7a8e3195d7241c7) --- sbin/fsck_ffs/fsck.h | 1 - sbin/fsck_ffs/fsutil.c | 1 - sbin/fsck_ffs/globs.c | 2 -- sbin/fsck_ffs/main.c | 8 +++++--- sbin/fsck_ffs/setup.c | 8 ++++---- 5 files changed, 9 insertions(+), 11 deletions(-) diff --git a/sbin/fsck_ffs/fsck.h b/sbin/fsck_ffs/fsck.h index 1864ea19f4ca..3b795783f39c 100644 --- a/sbin/fsck_ffs/fsck.h +++ b/sbin/fsck_ffs/fsck.h @@ -376,7 +376,6 @@ extern long secsize; /* actual disk sector size */ extern char skipclean; /* skip clean file systems if preening */ extern int snapcnt; /* number of active snapshots */ extern struct inode snaplist[FSMAXSNAP + 1]; /* list of active snapshots */ -extern char snapname[BUFSIZ]; /* when doing snapshots, the name of the file */ extern int sujrecovery; /* 1 => doing check using the journal */ extern int surrender; /* Give up if reads fail */ extern char usedsoftdep; /* just fix soft dependency inconsistencies */ diff --git a/sbin/fsck_ffs/fsutil.c b/sbin/fsck_ffs/fsutil.c index 5cf17e22fe80..2583e324e94c 100644 --- a/sbin/fsck_ffs/fsutil.c +++ b/sbin/fsck_ffs/fsutil.c @@ -616,7 +616,6 @@ ckfini(int markclean) int ofsmodified, cnt, cg; if (bkgrdflag) { - unlink(snapname); if ((!(sblock.fs_flags & FS_UNCLEAN)) != markclean) { cmd.value = FS_UNCLEAN; cmd.size = markclean ? -1 : 1; diff --git a/sbin/fsck_ffs/globs.c b/sbin/fsck_ffs/globs.c index 038fc3475742..b004dd7d48b7 100644 --- a/sbin/fsck_ffs/globs.c +++ b/sbin/fsck_ffs/globs.c @@ -71,7 +71,6 @@ int freefiles[MIBSIZE]; /* MIB cmd to free a set of files */ int freedirs[MIBSIZE]; /* MIB cmd to free a set of directories */ int freeblks[MIBSIZE]; /* MIB cmd to free a set of data blocks */ struct fsck_cmd cmd; /* sysctl file system update commands */ -char snapname[BUFSIZ]; /* when doing snapshots, the name of the file */ char *cdevname; /* name of device being checked */ long dev_bsize; /* computed value of DEV_BSIZE */ long secsize; /* actual disk sector size */ @@ -144,7 +143,6 @@ fsckinit(void) bzero(freedirs, sizeof(int) * MIBSIZE); bzero(freeblks, sizeof(int) * MIBSIZE); bzero(&cmd, sizeof(struct fsck_cmd)); - bzero(snapname, sizeof(char) * BUFSIZ); cdevname = NULL; dev_bsize = 0; secsize = 0; diff --git a/sbin/fsck_ffs/main.c b/sbin/fsck_ffs/main.c index 58e184f3581f..ee39760f4dd2 100644 --- a/sbin/fsck_ffs/main.c +++ b/sbin/fsck_ffs/main.c @@ -68,7 +68,8 @@ static char sccsid[] = "@(#)main.c 8.6 (Berkeley) 5/14/95"; #include "fsck.h" -static int restarts; +static int restarts; +static char snapname[BUFSIZ]; /* when doing snapshots, the name of the file */ static void usage(void) __dead2; static intmax_t argtoimax(int flag, const char *req, const char *str, int base); @@ -664,8 +665,7 @@ setup_bkgrdchk(struct statfs *mntp, int sbreadfailed, char **filesys) "SUPPORT\n"); } /* Find or create the snapshot directory */ - snprintf(snapname, sizeof snapname, "%s/.snap", - mntp->f_mntonname); + snprintf(snapname, sizeof snapname, "%s/.snap", mntp->f_mntonname); if (stat(snapname, &snapdir) < 0) { if (errno != ENOENT) { pwarn("CANNOT FIND SNAPSHOT DIRECTORY %s: %s, CANNOT " @@ -713,6 +713,8 @@ setup_bkgrdchk(struct statfs *mntp, int sbreadfailed, char **filesys) "BACKGROUND\n", snapname, strerror(errno)); return (0); } + /* Immediately unlink snapshot so that it will be deleted when closed */ + unlink(snapname); free(sblock.fs_csp); free(sblock.fs_si); if (readsb() == 0) { diff --git a/sbin/fsck_ffs/setup.c b/sbin/fsck_ffs/setup.c index d1d09d07b43a..c9aa19c7eded 100644 --- a/sbin/fsck_ffs/setup.c +++ b/sbin/fsck_ffs/setup.c @@ -380,14 +380,14 @@ openfilesys(char *dev) if ((statb.st_mode & S_IFMT) != S_IFCHR && (statb.st_mode & S_IFMT) != S_IFBLK) { if (bkgrdflag != 0 && (statb.st_flags & SF_SNAPSHOT) == 0) { - pfatal("BACKGROUND FSCK LACKS A SNAPSHOT\n"); - exit(EEXIT); + pwarn("BACKGROUND FSCK LACKS A SNAPSHOT\n"); + return (0); } if (bkgrdflag != 0) { cursnapshot = statb.st_ino; } else { - pfatal("%s IS NOT A DISK DEVICE\n", dev); - if (reply("CONTINUE") == 0) + pwarn("%s IS NOT A DISK DEVICE\n", dev); + if (preen || reply("CONTINUE") == 0) return (0); } }