From owner-dev-commits-src-all@freebsd.org Sat May 29 03:01:21 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1AC02637F06; Sat, 29 May 2021 03:01:21 +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 4FsRCM6j6jz3P0R; Sat, 29 May 2021 03:01:19 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 B4688228D2; Sat, 29 May 2021 03:01:10 +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 14T31Afv010985; Sat, 29 May 2021 03:01:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14T31AQh010984; Sat, 29 May 2021 03:01:10 GMT (envelope-from git) Date: Sat, 29 May 2021 03:01:10 GMT Message-Id: <202105290301.14T31AQh010984@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Wing Subject: git: 9b0f1d64b06c - main - Revert "Fix fsck_ufs segfaults with gjournal (SU+J)" MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9b0f1d64b06cdeacb7ee5a1ca95bb23c5381f12c Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 May 2021 03:01:21 -0000 The branch main has been updated by rew: URL: https://cgit.FreeBSD.org/src/commit/?id=9b0f1d64b06cdeacb7ee5a1ca95bb23c5381f12c commit 9b0f1d64b06cdeacb7ee5a1ca95bb23c5381f12c Author: Robert Wing AuthorDate: 2021-05-29 02:59:07 +0000 Commit: Robert Wing CommitDate: 2021-05-29 02:59:07 +0000 Revert "Fix fsck_ufs segfaults with gjournal (SU+J)" Fix fsck for 32-bit platforms. This reverts commit f190f9193bc10a8193c87e0a02fa91400e4eb159. --- sbin/fsck_ffs/main.c | 1 - sbin/fsck_ffs/setup.c | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/fsck_ffs/main.c b/sbin/fsck_ffs/main.c index 642e321fdd35..401ee10f9be3 100644 --- a/sbin/fsck_ffs/main.c +++ b/sbin/fsck_ffs/main.c @@ -272,7 +272,6 @@ checkfilesys(char *filesys) * exit status will cause a foreground check to be run. */ sblock_init(); - bufinit(); if (bkgrdcheck) { if ((fsreadfd = open(filesys, O_RDONLY)) < 0 || readsb(0) == 0) exit(3); /* Cannot read superblock */ diff --git a/sbin/fsck_ffs/setup.c b/sbin/fsck_ffs/setup.c index d69beff879e9..0ae7f1bbb28f 100644 --- a/sbin/fsck_ffs/setup.c +++ b/sbin/fsck_ffs/setup.c @@ -298,6 +298,7 @@ setup(char *dev) (uintmax_t)numdirs * sizeof(struct inoinfo *)); goto badsb; } + bufinit(); if (sblock.fs_flags & FS_DOSOFTDEP) usedsoftdep = 1; else