From nobody Wed Mar 16 23:30:33 2022 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 E26A31A37CA9; Wed, 16 Mar 2022 23:30:33 +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 4KJmjP4rPzz4h7X; Wed, 16 Mar 2022 23:30:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647473433; 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=yeq8RFdJRI0SOlQhjXbCtx7Tas28a/gbLT8ok97coUo=; b=Lg7F6vhQEpe6bXxu91BS1y2O5r9I22NlBqED5JWc4j+zm9kJhnp7uP2pWz/CH8iSPSYeU9 tf3reHBEWho65W57D4sKEqSuvs8fJmKg0a6bwvpNw1/OHbmEajpIuJ7zfrEpxVK985lR/4 RlmW/UIOMmhQ0ivAxKj5gMlQ5C3MuFso4lB9ngZNtiEFCQCaghwztBsQ6saAztYqdBNAkq oaI7M6hEBTIk/Jx/FepLSWDTHPRs5IwLHyQkK3i2dsYmevt0+X9yyv5rPdbySNVz0d+tsG dZbwq0f+yRvGkkKWo3FDZXNbUy+sPVrKs4SqrICz8S4oofGIfLCmVFLOeF8peA== 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 86DE01F736; Wed, 16 Mar 2022 23:30:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22GNUX2O042742; Wed, 16 Mar 2022 23:30:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22GNUXws042741; Wed, 16 Mar 2022 23:30:33 GMT (envelope-from git) Date: Wed, 16 Mar 2022 23:30:33 GMT Message-Id: <202203162330.22GNUXws042741@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: 47b50c23185b - releng/13.1 - Ensure that fsck(8) / fsck_ffs(8) produces the correct exit code for missing devices. 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/releng/13.1 X-Git-Reftype: branch X-Git-Commit: 47b50c23185bed6759e5ce1345dba45e5ca703a3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647473433; 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=yeq8RFdJRI0SOlQhjXbCtx7Tas28a/gbLT8ok97coUo=; b=gKKDnnlFOWkCiW7BRB1hd2PlOS6Mfea0qVqjHaK2wCbsYlrYgoPUmUxGWER/yOmoBg9wvZ 43PZChaInS37aFIwapwRiyQxCCixaElcV48j2hLgML0QKG/xPXYNuzliqcRzbWImYQPIvV rre5vBFrjkcFVUVU8yb9sckYRPWQe5Yeq0TJ5Ho0ahpLaIZZ8mA8pEZksLkWFVzkhfpue0 PizvGBIW3+zLVr3hZ2FCzmhEvxmpUXCN+A5SDS3sVptm95N7Dr7tfi5ELdxqhIGTrdATz5 ks+L9zBpfHZ7rehjLjwaJsasM7bW2x6OhDe/zG1gHaUmewTORDW5lzG8IGjlAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647473433; a=rsa-sha256; cv=none; b=JrE8wCb5USInhIyoN1VJUXQ4v56OGG3gCIttV3jsGPMPTWDE86keY0RUb2YANXqw6EMcEn XD8EIHRodSFTADBq/0u6YfjCS955Nvwe6nTS3HTzXxgqQ1DixZHEIvQKFHtOrv9t7NQQVj p7sUxi3fxfX9b4Vy/lLUhLOOA3pPp+rKHNu0Wc9OKC9q4spr+D2gO+Ot1Ov3Yhz4wcno14 TuzVTe1KTspSE0o0Ltkexo5ugsXvKGyp2oIrXy6zrcYAv2/Hk37YKuO2vIyYbOljakDvZd tlUkHfBGMRs2nD2csbLAyTbWY977NXUFwec0DVq4GPTV4aXOojqKwFJzMs10yw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.1 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=47b50c23185bed6759e5ce1345dba45e5ca703a3 commit 47b50c23185bed6759e5ce1345dba45e5ca703a3 Author: Kirk McKusick AuthorDate: 2022-03-16 18:37:15 +0000 Commit: Kirk McKusick CommitDate: 2022-03-16 23:14:57 +0000 Ensure that fsck(8) / fsck_ffs(8) produces the correct exit code for missing devices. PR: 262580 Approved by: re (gjb, early MFC) (cherry picked from commit 2983ec0a87a18943564548c5c00c879c8db83edf) (cherry picked from commit 934ba51bc929ee23248353a081a4cc4327a4ec54) --- sbin/fsck_ffs/setup.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sbin/fsck_ffs/setup.c b/sbin/fsck_ffs/setup.c index 45662636557d..14b34962d3fe 100644 --- a/sbin/fsck_ffs/setup.c +++ b/sbin/fsck_ffs/setup.c @@ -219,10 +219,8 @@ openfilesys(char *dev) struct stat statb; int saved_fsreadfd; - if (stat(dev, &statb) < 0) { - pfatal("CANNOT STAT %s: %s\n", dev, strerror(errno)); + if (stat(dev, &statb) < 0) return (0); - } if ((statb.st_mode & S_IFMT) != S_IFCHR && (statb.st_mode & S_IFMT) != S_IFBLK) { if (bkgrdflag != 0 && (statb.st_flags & SF_SNAPSHOT) == 0) { @@ -240,7 +238,6 @@ openfilesys(char *dev) saved_fsreadfd = fsreadfd; if ((fsreadfd = open(dev, O_RDONLY)) < 0) { fsreadfd = saved_fsreadfd; - pfatal("CANNOT OPEN %s: %s\n", dev, strerror(errno)); return (0); } if (saved_fsreadfd != -1)