From nobody Thu Jan 11 09:50:18 2024 X-Original-To: dev-commits-src-main@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 4T9fzb18XHz572Ys; Thu, 11 Jan 2024 09:50:19 +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 4T9fzb0kLmz4kn0; Thu, 11 Jan 2024 09:50:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704966619; 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=npyi+OSQFaX4Ke3a81/3aPLrlkNxzFmCIqWrjjXyCw0=; b=b7chmN5c40KRlr/HlCNm+gdQ6Dy/D4slkSC9Oc76zEmzrJqaUytQ2Jm/h+f5llQ7f9FI2U WIAlZjj26KsrYAqIbF7Vv+Q4cjoQ00Dt+pY+hVL+q0CsWHCrOERTlN15UWal0+geIPqucb hK6OGUZMY0onqyhZBExJnxSi8kchfzmJVdf81IgdA2DcSO5fCKNtsGjMfhxC7RwQvwBuml MIcW1KFF84uPr5NGuRmQmsrrcjiV8jjtqWm/XQAeo2p4X1LRew07sv1wQX5fn1pS766NRU eoT+TudcOIlLQ4YRt1fWImHDBcRlZYO3ZcIFkndYvjAc7AHOxzGm8w6a5llKnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704966619; 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=npyi+OSQFaX4Ke3a81/3aPLrlkNxzFmCIqWrjjXyCw0=; b=XFC13KdoI77kuNARpjVuss7zkZk3duYGM4rN7/6CscjPQTr8PeWT0d5FksZLexps/Wn/RB AVuAhMlL2SaicdqyvWu90EiiWVJZHR2XJkiba1OLCKlqGT3ZTwBUSqw0H1ojfBjakt6aS/ A0zbMf4+XvjaKD75TPkg2nvULrH8yupbanYjQKX7m+ngsxRxXKyANTtuBfG3jm5jWrZKBx X5MomwLsYTzdwx8TdXq9UPatwww7TFHCXgioGMgiiLZIloIhyVwFDN83uZqYRx5SvEj2t3 HjmdFcObNOL8Pgg9U+LQ7nGxfJmScIAfz+WyRjfGFN1NVMCH6bzeJV9AoRYMEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704966619; a=rsa-sha256; cv=none; b=YrPFG64pHE0wuZ+IXHX9rKlRmoX1TjiWAJOe6zMx1nzq693kXsJ/m8TPP+8KpgWX1yPbC2 wZsRtxRPMZaoc17OmhRFRcxCGgVygGXQklAkOzUbNSL5QHWXNoxQRNIiUEC7eiDwF6aOq2 TXjUc0Y83FlBnpn7aUgK5TH9ePGhOYVWGHqNGz43kEWUD+qtl2Hyd9KPT1wlFIf2YBdvtI s0WQUSem87nWvQZD9EL0n9J8mgDmQTQahGGbnjziPvhrQd9WxjaMeFGPBTlPeOVEa+zCKO EIWhwbp3mpmAYjZAnuBd+9fCYKuJUiahcHgsTlzYQqg/U+QLPMqGT7qsn/D70w== 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 4T9fzZ6xCfzDsr; Thu, 11 Jan 2024 09:50:18 +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 40B9oIL7041579; Thu, 11 Jan 2024 09:50:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40B9oIL8041576; Thu, 11 Jan 2024 09:50:18 GMT (envelope-from git) Date: Thu, 11 Jan 2024 09:50:18 GMT Message-Id: <202401110950.40B9oIL8041576@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: ed1a88a3116a - main - vnode_pager_generic_putpages(): rename maxblksz local to max_offset List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: ed1a88a3116a59b4fd37912099a575b4c8f559dc Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ed1a88a3116a59b4fd37912099a575b4c8f559dc commit ed1a88a3116a59b4fd37912099a575b4c8f559dc Author: Konstantin Belousov AuthorDate: 2024-01-09 11:32:39 +0000 Commit: Konstantin Belousov CommitDate: 2024-01-11 09:49:37 +0000 vnode_pager_generic_putpages(): rename maxblksz local to max_offset Requested by: markj Reviewed by: alc, markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D43358 --- 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 75919625707c..f9fb1ba23655 100644 --- a/sys/vm/vnode_pager.c +++ b/sys/vm/vnode_pager.c @@ -1356,7 +1356,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; @@ -1431,15 +1431,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; @@ -1451,11 +1451,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;