From nobody Thu Jan 18 01:13:59 2024 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 4TFlBb5zZWz57FF4; Thu, 18 Jan 2024 01:13:59 +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 4TFlBb5TrSz4ZPZ; Thu, 18 Jan 2024 01:13:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705540439; 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=n4t55m4wyHkfFL87UyDFRv5h8JruaWpYkRpI/gAdKYY=; b=CSQQfuCYka4OpHJrRqQyJF0u8cH8nCNJgizGb3IONZJZu5WSgSOzft0ScQguahAPouk2Fm CaSP4c9287wQZJky5oKNsLqK7AQpzLvooOHvsdDEeAzXqVb7pLiBWWdOZN01MiWtJ83Y1x FBeicTDJg9feFY6x54GWR4aqFvnmHvoVeJMcs8vCueMvvweUtmM7/Hdgxf6gCu9rDl24dS 6zuFRZgTEAza6i8Iw9RUl3iZROTBorma+zuQVYKrkMwr115lN4ZPXxnEnNaJgCeLYq1fuu mBk06z9QOouqBgP1dbE3tdh/9tPA/vxuDpgl2kF5zLT704oG1cehVCDUMzGEUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705540439; 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=n4t55m4wyHkfFL87UyDFRv5h8JruaWpYkRpI/gAdKYY=; b=nV+VOJLCyx/Pi/xxzcoC5hjhXyqDiD/pmyMTxrGIADWqGOEwK+DoS/ITmHGL6GlMAvi7a4 4TqV+0yCbWIe/cIU9/bs6M9iFfTOEqD7aB61gGxqoIlzhSKEMyQtO6rSwEHOCbYbclfVgM WoSLPFtvG/Dc36dMRpoUEMkIYIqEjRD4RLUQ3yZWVOI5mlP+NAEivcuT5Pq1PEzoDE8aH8 maUNPm5/0S/TTdwpVKeW0GrUIsT6p2cWqvxNQOx7N0fRm0uarKXyhf90YqYg3yqb8rcSwr t3sunAdWEO0bVukA1togFVOrh9TbCD7uz+5Mqt7+eT8LuhBKiZzLRMNiGT07zw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705540439; a=rsa-sha256; cv=none; b=Roip8TspfSyma51EP2trCdQrj4rgrMpiP6SbDaamMqjSf78cB63oC3A35oPCJCUHlWXORA mPtdoKMdftEEuqbT+UBIN7A1+m4v2vnXlPWAo7z01E7a47Z27dWo79AQeGtZvfJS6VMZ/E SMx/X1BksSoqBsed/qg3iouAdqP/owfkkKkiWMdQWz3LNMOjjmkQ7S0vBk7xUNJjogKD0Q s3r2rTdkQaFbPtT0a+ZLRaSDJIXlszMvL2EEptqK3Z4mS/QG+7bN1ttHnghrvt4RGfOwGm RaQqsZ5+AGfnyWJwBu+vM1kMIO2y0XSWzTs29/mtJfO2t/FvPzkV5XumNTocBw== 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 4TFlBb4XhvzmmV; Thu, 18 Jan 2024 01:13:59 +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 40I1Dx4m053308; Thu, 18 Jan 2024 01:13:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40I1DxUc053305; Thu, 18 Jan 2024 01:13:59 GMT (envelope-from git) Date: Thu, 18 Jan 2024 01:13:59 GMT Message-Id: <202401180113.40I1DxUc053305@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: bfa9a16569ba - stable/13 - vnode_pager_generic_putpages(): correctly handle clean block at EOF 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: bfa9a16569bab5240a6fdebcd407fd143d0d5ac4 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=bfa9a16569bab5240a6fdebcd407fd143d0d5ac4 commit bfa9a16569bab5240a6fdebcd407fd143d0d5ac4 Author: Konstantin Belousov AuthorDate: 2024-01-08 13:21:06 +0000 Commit: Konstantin Belousov CommitDate: 2024-01-18 01:02:52 +0000 vnode_pager_generic_putpages(): correctly handle clean block at EOF PR: 276191 (cherry picked from commit bdb46c21a3e68d4395d6e0b6a205187e655532b0) --- sys/vm/vnode_pager.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/vm/vnode_pager.c b/sys/vm/vnode_pager.c index 7fe0a91b8cf5..79de90dca6a8 100644 --- a/sys/vm/vnode_pager.c +++ b/sys/vm/vnode_pager.c @@ -1394,12 +1394,13 @@ vnode_pager_generic_putpages(struct vnode *vp, vm_page_t *ma, int bytecount, start_write: if (next_offset > poffset + maxsize) next_offset = poffset + maxsize; + if (prev_offset == next_offset) + goto write_done; /* * Getting here requires finding a dirty block in the * 'skip clean blocks' loop. */ - MPASS(prev_offset < next_offset); aiov.iov_base = NULL; auio.uio_iovcnt = 1;