From nobody Sun Nov 28 11:48:14 2021 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 A900718B37DA; Sun, 28 Nov 2021 11:48: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 4J26Dt2V70z4lDn; Sun, 28 Nov 2021 11:48:14 +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 362A863F5; Sun, 28 Nov 2021 11:48: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 1ASBmEJh026910; Sun, 28 Nov 2021 11:48:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1ASBmEPG026909; Sun, 28 Nov 2021 11:48:14 GMT (envelope-from git) Date: Sun, 28 Nov 2021 11:48:14 GMT Message-Id: <202111281148.1ASBmEPG026909@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 27e280d90d22 - stable/12 - ffs_softdep: Fix a typo in a source code comment 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: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 27e280d90d227e6fbc78879f3128e417f8c3cf96 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638100094; 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=kjgUIAKFNpHo4qX9Xb3TwpPFNX0uX2BWRXcjCSsyqI8=; b=RK8OAXKeWxymXBrVjmChGExKdF7/9VxU+wGe7kyH1j36/VabCN4RTf2SboTMx/17rbIYEU GaQE3ZdJv0azrBJHvFxgEiWwzIXzXVjRnWp8y4RrmCef8fJfNOrXSfah1TuQEQcnDT8sHz 5z/1fqAVjXEz8zSBewt5rYDTGTdBz3ZDLrgU44oQsEjH1Kq5HztA088p7jaRWg/kUedMQ4 hpa3OHA03ex3K3kHCrkmbGlfKAYdRrZfUolv+MLu4mior28f/CFOqlUIP/WOkkmk6XUmB1 foK8aPSOoJgsPy1rJeY2kKvIc40mUjNiZSN2mElV+GVrnGNymSa8WW6BDwI73w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638100094; a=rsa-sha256; cv=none; b=fr7r1eQf3adg+XGowvClxKsvDYAGhUI3vKLzizKSoNREIPAk53myy/ae9FfeUSjsaXnqJ+ O7th3tKXX5iO2KszMGm2dKc7oPQZCwYgVGcNN5EYTN48TtTK6nq4V8JvYezBKPxzslUqMF OICYmjGUsXEbtRCMvq5vfRBcg6NbiLSpVI5kCuumCgmbd92ntPFzSqfDQL4rx51gjOJjIp 2y2qA1wdJ7/SuHrfn2K+HytqI+x1Q6vQm6IBHvLsTLXSjXuixah1MumcDybxdZJTzNvpip tmWPvxJhlJEdVLHwD1yCiSnBg01RET7bEvXKoytKAXZQckzCn6TqTo7vooSLVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by gbe (doc committer): URL: https://cgit.FreeBSD.org/src/commit/?id=27e280d90d227e6fbc78879f3128e417f8c3cf96 commit 27e280d90d227e6fbc78879f3128e417f8c3cf96 Author: Gordon Bergling AuthorDate: 2021-11-19 18:17:41 +0000 Commit: Gordon Bergling CommitDate: 2021-11-28 11:44:45 +0000 ffs_softdep: Fix a typo in a source code comment - s/conditonally/conditionally/ (cherry picked from commit bebff615877efdf549e5033b47ade4d8553f6a77) --- sys/ufs/ffs/ffs_softdep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/ufs/ffs/ffs_softdep.c b/sys/ufs/ffs/ffs_softdep.c index bc83b92ee384..dc9c507ac11c 100644 --- a/sys/ufs/ffs/ffs_softdep.c +++ b/sys/ufs/ffs/ffs_softdep.c @@ -8804,7 +8804,7 @@ complete_diradd(dap) /* * Cancel a diradd when a dirrem overlaps with it. We must cancel the journal - * add entries and conditonally journal the remove. + * add entries and conditionally journal the remove. */ static void cancel_diradd(dap, dirrem, jremref, dotremref, dotdotremref)