From nobody Thu Dec 21 15:21:11 2023 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 4SwvK41tKbz54v6s; Thu, 21 Dec 2023 15:21:12 +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 4SwvK41R1Xz3D9c; Thu, 21 Dec 2023 15:21:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703172072; 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=yeC4WNgIHMdeTN8SxjQ1SKpT8IcW+tAwZO0sA2/Hiys=; b=cf7/eLy+HZzcQHszF61gJ4BLFtIgrB2H4KvdyZSCbFsOpPEMVIreRttSeVWozBIKx2IVBx vQubC4Qz9J9cFBkQ0iam/RhOoCd8lN05ImncveuYfl7JEhESQE2raA7XbPNijczFLGBXcP 3VE+hW2UbsibDEXemN3QW3YboWBTjVlsiIRWB1Az5DtMSqr8tIWbvY7iSYqKdRU0KUfiT0 Y9PxH/QsCCkoJ9BHacWP5VVM9jr9Sofp+yo0sUQ6g7ezbNINuCKowAgRTjFnwBC6nqYAsK 4iJQsiXrUSUTBQ0hw/LqQlukRwowoV7Frjm2WxKM09UKtZNOfFFE+p8YFaxv0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703172072; a=rsa-sha256; cv=none; b=eG4WZ+dj7VaSOaSXSPdiRqbsDb+81Ztsjnv1KezyrJS8ceQGLT658276z+zI381Adn+SVk urmC4DFw8ZcL9BJ6BcA/n3FrTdjLdXBUo693JOlKq2/XDPwp1PeOeh1ky3CLR3i48BGBIm rOZWqHy7A+GVsVCKVKXxvhJJ0t7EfnkNg5uZsfiVDI2VcuHGrj+VzipgXwoR+REmE8W1Pe qwBDl0V3L/K7RmfF73OJl1Z0QCAyV0Bu2q9bYvA34OlFTsNo26rnyimHUoQW5Y1cKz9MB2 rK7+7aBX8eiJhf95Ynx8HtcHR0fFVNwFu2Z4AcPQSeyrNMZYA9uD0gMCAYtnZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703172072; 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=yeC4WNgIHMdeTN8SxjQ1SKpT8IcW+tAwZO0sA2/Hiys=; b=yDfgYPoANjhzL04RvIMozffc2HFsocYAYohdOvxGFOdwIloMEckf/8vJdBk7Q7u4hErMzk 5+8NiurnMJ668ZGNA0MX6HY3ez3NXiPk+e1nfGHe2qc/5bJ5eLbzea7nJA2TkWB7i6C/9x C5HbsFRlu7b1bQO3Bz7aOjMH95aeFX0tWK8raG12LoOpJtH68/A01Uqq06qsulUxgybfiZ KfU37VNTMsLmp8cGFfmMY1ycHqbVROEN3M/pZQk8DazJF+RG8pOWdRns5NKIp1CrHbLkfV IHHmibXRzxsP2oOiSODx7mU+gDepFpJrIumfbP1nzhrM9Uqu53fa/bQkz15WGQ== 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 4SwvK40WKfzdLx; Thu, 21 Dec 2023 15:21:12 +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 3BLFLBJC043298; Thu, 21 Dec 2023 15:21:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BLFLBJx043295; Thu, 21 Dec 2023 15:21:11 GMT (envelope-from git) Date: Thu, 21 Dec 2023 15:21:11 GMT Message-Id: <202312211521.3BLFLBJx043295@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: 6bccb677d06e - stable/13 - ufs: do not leave around empty buffers shadowing disk content 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: 6bccb677d06ea15fb34d00b482c77c8f8bf35e19 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6bccb677d06ea15fb34d00b482c77c8f8bf35e19 commit 6bccb677d06ea15fb34d00b482c77c8f8bf35e19 Author: Konstantin Belousov AuthorDate: 2023-12-11 22:57:28 +0000 Commit: Konstantin Belousov CommitDate: 2023-12-21 15:20:39 +0000 ufs: do not leave around empty buffers shadowing disk content (cherry picked from commit ca39f23347e1416a28dde13279bfe5841ad9a746) --- sys/ufs/ffs/ffs_vnops.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/sys/ufs/ffs/ffs_vnops.c b/sys/ufs/ffs/ffs_vnops.c index abc1c3524396..21e6e22c6f88 100644 --- a/sys/ufs/ffs/ffs_vnops.c +++ b/sys/ufs/ffs/ffs_vnops.c @@ -969,8 +969,15 @@ ffs_write( * validated the pages. */ if (error != 0 && (bp->b_flags & B_CACHE) == 0 && - fs->fs_bsize == xfersize) - vfs_bio_clrbuf(bp); + fs->fs_bsize == xfersize) { + if (error == EFAULT && LIST_EMPTY(&bp->b_dep)) { + bp->b_flags |= B_INVAL | B_RELBUF | B_NOCACHE; + brelse(bp); + break; + } else { + vfs_bio_clrbuf(bp); + } + } vfs_bio_set_flags(bp, ioflag);