From nobody Thu Jan 18 01:14:00 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 4TFlBd0lcpz57F68; Thu, 18 Jan 2024 01:14:01 +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 4TFlBc6P3Gz4ZpH; Thu, 18 Jan 2024 01:14:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705540440; 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=rRSQD3zJRnaLwe8+Buo3jfYpEDjVGztCGGt7y35Dubk=; b=gzkEe+mSu21YArayt39NniQMGzcz2khqtZjjkRMAhDKM7wRvrLCRrtTk/cDIN8qdMkpsRJ fV60J9qiSHFEz3f0dseq9asy6l7NZ/SUDWqaRc50Vrg0qFqRZaQMZl+AoN5MKqRZCoXwsa NN8WtSiloFuSjyWvwMNCWAC5e5B7Xjfheu+zFywbbepfr8BZfRcK3d3205AdDywQVDX53V k4WWPuLmTUKcKvWY9KNw2dYSnyWB0Q817/fm25ZqT4bKboqAyM6LgfBBlr3CBoooVgxZMm rW4BhJgCNi/NT0o+ZQJxmFld6jdLiBcnz6/p32o2VMW8XsPYOgP0s6xXQ7B4DQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705540440; 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=rRSQD3zJRnaLwe8+Buo3jfYpEDjVGztCGGt7y35Dubk=; b=mOBj1HOOWJLZpQaNxX3Ntnj48mfTUm8Ad4y3hsgtBzhHb2XLOqzh0S9taIHLQc4WWttCEp TtpCMTqRYLJxgC0B9U7tshunnv6vzf6MZxx6DaDAbhLAHwRtWxMrjSSwaexAurVFfhFGj+ 6CdECggwttXAISel9GSx6XUtTCk78dIYiWudMG9sc1jTigppQBd9nAwSy4b270G7zlUKsb GTA4aPDHgfg7br7AqrTAzibIeeFTVpJhB7C1h/9lUS8z//7W8pM5LpQunrQ2a9wRD8MwuO oL8imsnqDtoAlhE8Znw+TpzBqgKhWG0AqORtOwiB+ISPVzso4gEp3rv5BVttIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705540440; a=rsa-sha256; cv=none; b=wcjfHBybkakpz/UAAzlK1i3u1+/DegdQ6V7p+3kRz//w3sBTgloCsCwmFDZsT2DsHCzpfP uH0YcDPP6HcNw36XSxM4P7629IgbNZElhsFvSdQapltqbBetCDBuG0An3g+XwFMMQ0KPXc A/uTKS6T8f3GLtCCJtrGwtszaD1MTm3I7nkjOFwpvudN++OWDvy4MXFvaC7T9VLbmEU7+d k2/KRmkraPOWUQqPLOgJdmDUl3c1zwvwnHHN9Sh9XRKgcMscKhgaPqwtOrxTEweztxhIGC 5UX8ckNm/kgEZItlylX2rILz4eC4EyhnvQGc+kAiDevN7M+UB3b5YG3hFSlJww== 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 4TFlBc5TCDzmsn; Thu, 18 Jan 2024 01:14:00 +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 40I1E0Di053359; Thu, 18 Jan 2024 01:14:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40I1E01X053356; Thu, 18 Jan 2024 01:14:00 GMT (envelope-from git) Date: Thu, 18 Jan 2024 01:14:00 GMT Message-Id: <202401180114.40I1E01X053356@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: 8f0d5a7eb1b0 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 8f0d5a7eb1b08e6175093fdc5fc4803f6a7bb638 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=8f0d5a7eb1b08e6175093fdc5fc4803f6a7bb638 commit 8f0d5a7eb1b08e6175093fdc5fc4803f6a7bb638 Author: Konstantin Belousov AuthorDate: 2024-01-09 11:32:39 +0000 Commit: Konstantin Belousov CommitDate: 2024-01-18 01:02:52 +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 79de90dca6a8..b994de8592db 100644 --- a/sys/vm/vnode_pager.c +++ b/sys/vm/vnode_pager.c @@ -1286,7 +1286,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; @@ -1361,15 +1361,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; @@ -1381,11 +1381,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;