From nobody Sat Apr 02 13:43:43 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 EB8221A583A6; Sat, 2 Apr 2022 13:43:44 +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 4KVytR6KqKz4nq3; Sat, 2 Apr 2022 13:43:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648907023; 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=DZnlaYosl1eaRJ8/PGo8TgkLIA1/mwD286rWdCb6iUI=; b=MyE9Ar7HcjQUJT3gdfuGjDvdOYl7iVypsSNUTFFQKVaZG3EHyXwORrzv/lK6cFvA/xfRdG hrS8+URI+r4HGasUNXMORWykY6xn2F8PHpmM9nrarGuqqhWEenjhciAQpR5Sfvwz+dq961 hY7TfpNNmFzgql6gWsivNFqTtMKeXN6JR2WL0s+ONOnuNT1m+BMOq4ouPa83F0N9BLunIi aUGuLWxu8h5xrvbFyL4mtW7dtn/lrMSYBq1kIFMhOomUmVBSRzdYbyFKUqfboYYsI0GQDF 2n7XqsqQxE6z2egEwCRbKq3fZS2IYgrpx4+m7DwgKnzFEHL2XpGyp3IJvD9fTw== 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 45F241E33; Sat, 2 Apr 2022 13:43:43 +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 232Dhh8b017496; Sat, 2 Apr 2022 13:43:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 232Dhh0I017495; Sat, 2 Apr 2022 13:43:43 GMT (envelope-from git) Date: Sat, 2 Apr 2022 13:43:43 GMT Message-Id: <202204021343.232Dhh0I017495@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: 1552ec81a481 - stable/12 - ffs(3): Fix a common typo in source code comments 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: 1552ec81a481b8e9864e6130e7da9ffebb5803b6 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648907023; 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=DZnlaYosl1eaRJ8/PGo8TgkLIA1/mwD286rWdCb6iUI=; b=PSilxNibJAwSvgexvKoT6Te+bb5sE0HwhWlARXS9yRZ7QkuBmgGdklHUq3OxolwPm4nchr 3G3vMwTN/mGOiJKW9bwiC/5vfwKYQWDpASmCDIjmzCyVUj6n1rCMgrBScHLdk5+HyO7dwV rxbf/zum0rA+woDD9WFtjNNg4gpUzcFT5tKHmjGWSl97/xjUkFjYam4yXTNVcOhdW8O5iV xMfcen7b5eQXZBij4h9xCSdha6vwMkDWe7P1/eHqryMyq3OX9gjx2M4maeUA/lAKfw7UTy 2ENPqqFtDp7BZTLy0vkFvoLgZWfb2X6NESakdkN7a9cC3ZJUFFU/8isdIqAezQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648907023; a=rsa-sha256; cv=none; b=GkAdrgomMIyzd1tlI0NSRzkQ0PCfXlSrMi6XUHnBKg81IDzpVtLhkTNyWZmSd34fHp5Y+0 4T1YvT3N0rWVN1MfOXZDAUEuuaELCuyxAdqskF+yt0s4lktQ15fgSkN0mhfKJvEX7jHjKI +sG0mbq/Uj5612wdvku3FZT5Mc0/vUAMOv9lpeYctinvzz1gZuf+q611Bi6WhPhIXyU2Dv IPBttQPFuwCzwJkNK9a4dHdE6/9y9cv++MTOYwziV99mFGWTzHW3H/Aehu45Kqa7Hz9ZmG zSLNaUdG82wW++bHWTBy/oTjsDoaSpJFqGndwVARLSF6lL0WeQ3WJetgISXiZA== 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=1552ec81a481b8e9864e6130e7da9ffebb5803b6 commit 1552ec81a481b8e9864e6130e7da9ffebb5803b6 Author: Gordon Bergling AuthorDate: 2022-03-27 16:03:16 +0000 Commit: Gordon Bergling CommitDate: 2022-04-02 13:37:20 +0000 ffs(3): Fix a common typo in source code comments - s/quadradically/quadratically/ Obtained from: NetBSD (cherry picked from commit 2733b242e4c69240fed52854682f0c3b0079be17) --- sys/ufs/ffs/ffs_alloc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/ufs/ffs/ffs_alloc.c b/sys/ufs/ffs/ffs_alloc.c index 842b88ec178c..3721f54db283 100644 --- a/sys/ufs/ffs/ffs_alloc.c +++ b/sys/ufs/ffs/ffs_alloc.c @@ -136,13 +136,13 @@ static void ffs_ckhash_cg(struct buf *); * 1) allocate the requested block. * 2) allocate a rotationally optimal block in the same cylinder. * 3) allocate a block in the same cylinder group. - * 4) quadradically rehash into other cylinder groups, until an + * 4) quadratically rehash into other cylinder groups, until an * available block is located. * If no block preference is given the following hierarchy is used * to allocate a block: * 1) allocate a block in the cylinder group that contains the * inode for the file. - * 2) quadradically rehash into other cylinder groups, until an + * 2) quadratically rehash into other cylinder groups, until an * available block is located. */ int @@ -1077,12 +1077,12 @@ fail: * If allocating in a directory, the following hierarchy is followed: * 1) allocate the preferred inode. * 2) allocate an inode in the same cylinder group. - * 3) quadradically rehash into other cylinder groups, until an + * 3) quadratically rehash into other cylinder groups, until an * available inode is located. * If no inode preference is given the following hierarchy is used * to allocate an inode: * 1) allocate an inode in cylinder group 0. - * 2) quadradically rehash into other cylinder groups, until an + * 2) quadratically rehash into other cylinder groups, until an * available inode is located. */ int @@ -1589,7 +1589,7 @@ ffs_blkpref_ufs2(ip, lbn, indx, bap) * * The policy implemented by this algorithm is: * 1) allocate the block in its requested cylinder group. - * 2) quadradically rehash on the cylinder group number. + * 2) quadratically rehash on the cylinder group number. * 3) brute force search for a free block. * * Must be called with the UFS lock held. Will release the lock on success