From nobody Sun Nov 20 17:14:14 2022 X-Original-To: dev-commits-src-branches@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 4NFcZG4HNJz4hfXL; Sun, 20 Nov 2022 17:14:14 +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 4NFcZG3jkTz4Hd9; Sun, 20 Nov 2022 17:14:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668964454; 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=gsV1Wei1Tbncj+Uwu9YzXiUcc/sbtZSV5xcAaQ4SeGs=; b=EKCPA96z+PIkc2S1Yz5Lwby5/TlYq50XwZYuO2GpfdqcBryAYxy0Ts6aLKHowWMCLK+dqF un1m+F2dMA7HBAIlkLPfKjnKnEw7F4TNJbw7L3hLoFL55sRgB2QkGQ05mlFP3cewv8f1Iy KnqFpEPNamF7I2+4oc+Z86Mvf8X5i3KnhKDNXb4QK8LgMS+A7Dw0jRsdme6YT16rnjV61x 3RcTdDRdItOAT94LeBBxtFS7QaQodX4f0jwAO+RHEwPXYE0FZNYrzt3WFAKu86MQQ4Fc77 gskAm4KXb9/wr7zAUj8kMS5b3FVLWbp2zACPhUE4EQq7hvXqLqgD3qmOT0WZ1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668964454; 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=gsV1Wei1Tbncj+Uwu9YzXiUcc/sbtZSV5xcAaQ4SeGs=; b=Ve+KAPDvhxPZCcV5DDPjyXcfGxTaEl8tH2wvJq1KgERt9G6YO7LVMD6r41uwlTjQVivOEO KBp9EygRAIqQn2t1wGSnDAm8QXnhPVibzPWM/7B4paxLLYFrKm+wZ4SUUT23dtCjNE7AV2 QyG5klfeStEa/SSscf8LXSluYZgWHAGvT4kuJeZPDdrGDgDt5LniqkOzB+V1mgTcT6pFZg fsDpsoaw4k0wh3yoSlCH6ft5PWJyxtjKbleo+W8MIEW51ez6HI8TiSrEft7wawKHMKsRpU TsJOGyQK+asJ7qoWMkjwk9ZnfVokww8X5t0RmWDMX5bhzHrREErAUN2sp1KbdQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668964454; a=rsa-sha256; cv=none; b=Kz/pA8Jlhb9+XK+BTjFa5MPStRTj7GBndfeWGKF97GYOwyMVhxNmVF+mE9DqIYQ9ZGb56n /dheOuvZcB62kexEsIIa6HPuQoUu+YjWA7/ghGrYa9obLycoSYeAUXW7oRVC01C6y2vMFQ OH11L4pJ+8143lMylrnwNlgIKoypMQklcW60WxF15L/rX2Vyabhvwa8amQrersD4WJI3Gj eUAbpFZ74f0s2YBPKhMo/KiVn8HyuUOKdcIArvqjTB+y5YXETrANJeB5lSXCE9AZB2BkkX SaE/XcxN6mrEAZaguLyaz9Rwq96DCF5qwhGqHNBRiLAscTxA9DHy5Pn/p2p0jQ== 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 4NFcZG2lLZzXCD; Sun, 20 Nov 2022 17:14:14 +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 2AKHEE2B024199; Sun, 20 Nov 2022 17:14:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AKHEEwI024198; Sun, 20 Nov 2022 17:14:14 GMT (envelope-from git) Date: Sun, 20 Nov 2022 17:14:14 GMT Message-Id: <202211201714.2AKHEEwI024198@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: bca262f0f351 - stable/13 - Fix for tunefs(8) unable to add a UFS/FFS soft update journal. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/13 X-Git-Reftype: branch X-Git-Commit: bca262f0f351e3881d478b7a9764c91ccb83c260 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=bca262f0f351e3881d478b7a9764c91ccb83c260 commit bca262f0f351e3881d478b7a9764c91ccb83c260 Author: Kirk McKusick AuthorDate: 2022-11-12 23:36:07 +0000 Commit: Kirk McKusick CommitDate: 2022-11-20 17:13:49 +0000 Fix for tunefs(8) unable to add a UFS/FFS soft update journal. The reported bug is UFS: bad file descriptor: soft update journaling can not be enabled on some FreeBSD-provided disk images – failed to write updated cg. The UFS library (libufs(3)) failed to reopen its disk descriptor when first attempting to update a cylinder group. The error only occurred when trying to add journaling to a filesystem whose first cylinder group was too full to hold the journal. PR: 259090 MFC after: 1 week Sponsored by: The FreeBSD Foundation (cherry picked from commit 5c7ba6bdf83fda82cce70f384e2ec8218f13002e) --- lib/libufs/cgroup.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/libufs/cgroup.c b/lib/libufs/cgroup.c index 1c3e271c4295..41fe587531bf 100644 --- a/lib/libufs/cgroup.c +++ b/lib/libufs/cgroup.c @@ -266,6 +266,10 @@ cgwrite1(struct uufsd *disk, int cg) static char errmsg[BUFSIZ]; if (cg == disk->d_cg.cg_cgx) { + if (ufs_disk_write(disk) == -1) { + ERROR(disk, "failed to open disk for writing"); + return (-1); + } if (cgput(disk->d_fd, &disk->d_fs, &disk->d_cg) == 0) return (0); ERROR(disk, NULL);