Date: Sat, 29 May 2021 03:01:10 GMT From: Robert Wing <rew@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 9b0f1d64b06c - main - Revert "Fix fsck_ufs segfaults with gjournal (SU+J)" Message-ID: <202105290301.14T31AQh010984@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by rew: URL: https://cgit.FreeBSD.org/src/commit/?id=9b0f1d64b06cdeacb7ee5a1ca95bb23c5381f12c commit 9b0f1d64b06cdeacb7ee5a1ca95bb23c5381f12c Author: Robert Wing <rew@FreeBSD.org> AuthorDate: 2021-05-29 02:59:07 +0000 Commit: Robert Wing <rew@FreeBSD.org> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202105290301.14T31AQh010984>