From nobody Sun Dec 04 07:00:58 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 4NPyJC0kYsz4jZkM; Sun, 4 Dec 2022 07:00:59 +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 4NPyJC0Jnsz3DNS; Sun, 4 Dec 2022 07:00:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670137259; 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=GznWX+MPhxHTZzm0IaviSxx2o6ZIBEZxEOj36hVWNn8=; b=wL5bUHfSN5eD6eDeqSM2s/s/6HeNjLL4Zq5BrsIKsQSmivDf7ZUJIzPXRw8NtwB1pDXpnA q2q/aLqF2zt2ivRQBGuwZpnB0/GP+DAyGlaThVEzYFufNb5iOVB5Ix2DVtjhFiYE6uaIoK sWCevHTLNQiokML8lam+qOEoqmkPjVZa4O0ewaTKqVVzqEYrj/TBawz3Ng6zk2kPLNbz/h NeaKLik1/8Na/7aZ3zATLa1TUU+4N062HWwBrneVhA0gBqhqSomZuO46i9C3170oyQHmSV yPaIDIte1Lb5jqrUomD6O6+FFIVQm7jcT+ojSYsmd5QB1o9xfwMM/5AVVoB54g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670137259; 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=GznWX+MPhxHTZzm0IaviSxx2o6ZIBEZxEOj36hVWNn8=; b=lUYgjzj63tH/PIJa0o+KNbtQrNcNj1r2E/7hWJp7nukHMvMAbWyvIhraIgy2uneqKdEkp1 v6Sup6qqJZLVR/xXAcJ+KXbiS0gPsUEo+dH5p1u9TmycD5DaflGWHYOt5nwIKKJLrnYiId wxaXA/RziHTSI0O8kczwXKVy6hrRecRkWBuwhO1RDl//3qxGAoYs2tJzwwusbLX0Z8BCrP wJCy0/sE0dhGVJCOhFltuXU9oEEa3DXgo7NqfeITfjI8/lwFPrDOCo6pmbqXPuzjNNA/Gb 4VRAMVxSarj103HhO6q8vNt0RWa++yD4hXeXuq8blX4fU5AaAUEZpoONmzTmQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670137259; a=rsa-sha256; cv=none; b=xHpNIMKiWWvtzheuBCW2FBkRuzd3lejkBmIFlHqkSIsNvWwaj6Uk2wRD6F+6fX9PHGXkyi 2RGzJzqUvvfZZG2t+wAUcGYpoiRW/nW4t/FdkXZzVB46nTYy+5OjAbz26LMnR1SWbAplix 3UwOj5OZx91LlBkrdOEAT8nnWDWqZhJdmU469YFfUg2t56IAGqdvle/hxVZn8dMi5Sjdtk bAvac8X9dKvOpuE1FM/a6nupmxMX4xgLVASHtBN7NoLUVaT8UP845GCxWcak8lw7gz8SWz YHpQh6tPRVXWS4vuwJzqMH5PG46AZG+P2ite07wWTIVfvF31VODi5ZsGaok7jg== 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 4NPyJB6TdZz1PL6; Sun, 4 Dec 2022 07:00:58 +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 2B470ws3082549; Sun, 4 Dec 2022 07:00:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B470was082548; Sun, 4 Dec 2022 07:00:58 GMT (envelope-from git) Date: Sun, 4 Dec 2022 07:00:58 GMT Message-Id: <202212040700.2B470was082548@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: 3dd649789469 - stable/13 - Increase the maximum size of the journaled soft-updates journal. 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/13 X-Git-Reftype: branch X-Git-Commit: 3dd649789469a829bd44426d727da621d7a7b52c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=3dd649789469a829bd44426d727da621d7a7b52c commit 3dd649789469a829bd44426d727da621d7a7b52c Author: Kirk McKusick AuthorDate: 2022-10-21 18:00:00 +0000 Commit: Kirk McKusick CommitDate: 2022-12-04 06:55:49 +0000 Increase the maximum size of the journaled soft-updates journal. (cherry picked from commit 243a0eda9ace2f4d9cdd5291c352816ddc9ebdb2) Sponsored by: The FreeBSD Foundation --- sbin/tunefs/tunefs.c | 1 - sys/ufs/ffs/fs.h | 1 - 2 files changed, 2 deletions(-) diff --git a/sbin/tunefs/tunefs.c b/sbin/tunefs/tunefs.c index 2eca8e0a3e36..3e0e609c2b2c 100644 --- a/sbin/tunefs/tunefs.c +++ b/sbin/tunefs/tunefs.c @@ -974,7 +974,6 @@ journal_alloc(int64_t size) */ if (size == 0) { size = (sblock.fs_size * sblock.fs_bsize) / 1024; - size = MIN(SUJ_MAX, size); if (size / sblock.fs_fsize > sblock.fs_fpg) size = sblock.fs_fpg * sblock.fs_fsize; size = MAX(SUJ_MIN, size); diff --git a/sys/ufs/ffs/fs.h b/sys/ufs/ffs/fs.h index df003c4282d9..8069b2db54bd 100644 --- a/sys/ufs/ffs/fs.h +++ b/sys/ufs/ffs/fs.h @@ -767,7 +767,6 @@ lbn_offset(struct fs *fs, int level) #define JREC_SIZE 32 /* Record and segment header size. */ #define SUJ_MIN (4 * 1024 * 1024) /* Minimum journal size */ -#define SUJ_MAX (32 * 1024 * 1024) /* Maximum journal size */ #define SUJ_FILE ".sujournal" /* Journal file name */ /*