From nobody Thu Jan 18 01:02:40 2024 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 4TFkxY17WKz57DTf; Thu, 18 Jan 2024 01:02:41 +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 4TFkxY0dVtz4Xby; Thu, 18 Jan 2024 01:02:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705539761; 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=8Bn3PUARMica/1PvkQwcFkNf0sRdYpsWdUunxJH9duM=; b=k174HNpMy/prlX39E2CD0tkk287il2qyCQZVyGXAeEz2OrPcJnyE0j2gqfnUpOZB7pLLOM FpuONg2aDZy9kttu8BWHu+dQ3WPDFMpXZmw4OCfPrbU0l30OiLxFNFIXgJvt6hNr6C85ua Mg33zTLGhAE4U8ylazuYrw50qMbRMjHXOM75BrJAL+FSjEk6XFJkXam3ewmfmGvR27FwpJ Rig0mqusrKZ6jR7Xn8VR11G3UZ2SSHUwV0Q+jSI4+yvtUmP0Lwhebv2BIkzcFEmXfgUj1n pqUT6UFOFHzOP4+r59Kx8lOKJNt+C4hyUpxR6daBz3PY8dwtPOge6ke9Wj5e9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705539761; 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=8Bn3PUARMica/1PvkQwcFkNf0sRdYpsWdUunxJH9duM=; b=yFLjPPW6tjcwi5Cl9DlSxZwIrGykr2WP5Tx4ubrsMRLpXURKiMx76/s8jBkTwn9Onj9h9f v7P3um/4PF4ZH6I10V2LsBo5AsAzZND6wHIya9tBZgnABTYdtuxbo3OUWnw4nnqlBWeXEs j6TE/asom7Mnu9PjUBmLuZ05je8PLigV9EaiuoQWcrZ/7IRXXhTxwNJY+TWAcbtLMd1/2O uStia9IasJCPIxjJGrHgds3I0+AgVVEC/KMy2XqGZlm3i0Lwrokxl5Bh8cyh0TXLL5fQon Ycukpw+e6t6w3zwoJTBMpWqWGGzoIqjCIF1WXizYJM8mVlitnP+/HKmFE8gfyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705539761; a=rsa-sha256; cv=none; b=D6PoeKn+apQHEeJxhJ1FXSdG+8oQ3N7WZaIBRZNVYOBwWQ70/RTEk0ij7l1QUupHz474uV V6eMi9HYzC9H1hJQnufZ/pTXvf0nA4AOqTdpWYCveULxfK6+ba48rBngULcEFxXk4lXqOd y4sR7eI9auZxKQSZLZor9hMQ2KcIZqKGXvPjlp7LW4wxo8L8rdOb/jBkNzawrqUVPe6HS2 DBdWe9lzDqEhGkoZYbulA+g19c3rpphCZK5DyWFnATvfedk3JmORzZHbfVmudMWTObepw6 6iopkHhrwHxbfBKviCvbNz8iQThtz9d9GMskIQ8txgJUiHHRCMQoZSnbZyk4Lw== 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 4TFkxX6pkJzlgk; Thu, 18 Jan 2024 01:02:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40I12eLE036704; Thu, 18 Jan 2024 01:02:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40I12ecg036701; Thu, 18 Jan 2024 01:02:40 GMT (envelope-from git) Date: Thu, 18 Jan 2024 01:02:40 GMT Message-Id: <202401180102.40I12ecg036701@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: c4c138072ae6 - stable/14 - vnode_pager_generic_putpages(): rename maxblksz local to max_offset 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c4c138072ae6623661af9392f86e5c347bfb97dd Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c4c138072ae6623661af9392f86e5c347bfb97dd commit c4c138072ae6623661af9392f86e5c347bfb97dd Author: Konstantin Belousov AuthorDate: 2024-01-09 11:32:39 +0000 Commit: Konstantin Belousov CommitDate: 2024-01-18 00:51:33 +0000 vnode_pager_generic_putpages(): rename maxblksz local to max_offset (cherry picked from commit ed1a88a3116a59b4fd37912099a575b4c8f559dc) --- sys/vm/vnode_pager.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/vm/vnode_pager.c b/sys/vm/vnode_pager.c index 013b371964db..5bfaea3d4ff1 100644 --- a/sys/vm/vnode_pager.c +++ b/sys/vm/vnode_pager.c @@ -1358,7 +1358,7 @@ vnode_pager_generic_putpages(struct vnode *vp, vm_page_t *ma, int bytecount, { vm_object_t object; vm_page_t m; - vm_ooffset_t maxblksz, next_offset, poffset, prev_offset; + vm_ooffset_t max_offset, next_offset, poffset, prev_offset; struct uio auio; struct iovec aiov; off_t prev_resid, wrsz; @@ -1433,15 +1433,15 @@ vnode_pager_generic_putpages(struct vnode *vp, vm_page_t *ma, int bytecount, auio.uio_segflg = UIO_NOCOPY; auio.uio_rw = UIO_WRITE; auio.uio_td = NULL; - maxblksz = roundup2(poffset + maxsize, DEV_BSIZE); + max_offset = roundup2(poffset + maxsize, DEV_BSIZE); - for (prev_offset = poffset; prev_offset < maxblksz;) { + for (prev_offset = poffset; prev_offset < max_offset;) { /* Skip clean blocks. */ - for (in_hole = true; in_hole && prev_offset < maxblksz;) { + for (in_hole = true; in_hole && prev_offset < max_offset;) { m = ma[OFF_TO_IDX(prev_offset - poffset)]; for (i = vn_off2bidx(prev_offset); i < sizeof(vm_page_bits_t) * NBBY && - prev_offset < maxblksz; i++) { + prev_offset < max_offset; i++) { if (vn_dirty_blk(m, prev_offset)) { in_hole = false; break; @@ -1453,11 +1453,11 @@ vnode_pager_generic_putpages(struct vnode *vp, vm_page_t *ma, int bytecount, goto write_done; /* Find longest run of dirty blocks. */ - for (next_offset = prev_offset; next_offset < maxblksz;) { + for (next_offset = prev_offset; next_offset < max_offset;) { m = ma[OFF_TO_IDX(next_offset - poffset)]; for (i = vn_off2bidx(next_offset); i < sizeof(vm_page_bits_t) * NBBY && - next_offset < maxblksz; i++) { + next_offset < max_offset; i++) { if (!vn_dirty_blk(m, next_offset)) goto start_write; next_offset += DEV_BSIZE;