From nobody Wed Dec 20 08:30:22 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 4Sw6FW2ddSz54cNT; Wed, 20 Dec 2023 08:30:23 +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 4Sw6FW1fhyz4LrW; Wed, 20 Dec 2023 08:30:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703061023; 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=YZorguoJgwUPBCxVdE6P9FQY9hLCmTj5Tcz9P0M+Gf8=; b=F0fhGgTpOb+riIU/UbsmUH0ve4w5M5wuishPMcXQkIKBknHKnoRZLJT51a95rwjfaUJeLo AcxFRyz6gZZKdQ9KeT+ItvHlyfztltKsZZyx0p6EOztY8wJvh1iR3TDTUblhs3d3ypH4Lr DdYBJm6FhEDmLiJa0a0zCah0bLEondy8W0FhKcrZiOxLCAgYQ7flqYVVQRmq621UvmRHmy lmE7jpy3283fgrvkwjYifSsPnrCKPFS8tJ9Eqe/d0f+YvcSPlxsEceRVjccbXjm4kPmY1e v96UUHRiumPZKT5rXFOmm2NA5RjdcWj10TsIXc2LHTpEMJ3tReHKjF0ywc7u2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703061023; a=rsa-sha256; cv=none; b=ESGzr0kgP+PILfwCY3CewhEvQM37yap4UC7jE/B+wGrFxLJjVvGR3AQnO4dGFVWFoZpuFw 9m/x+k1Vsu2ibwu48HGLBD/KZp7f6Gs7LRykuTuFeBKDWhJsNwpYzaqvqjJEeDNUIPb6pC WGaguWfN56PIR9/ASYvT/EiocubqMlrk7w6mjU2KRTM+hH6u81LFEtAldWyM+NQqzax1lE MNu/OANCPpGQ8H/f9lQzFHwC3425/HObA7jhsp8dmtdXIC+LMv80YvdvKlBrqDo+ZeNsME xhnEHKqS3mfjfyWRC7S4sRc2UoYIFAhXEjFTNNuVIA6HdAJLXk4lEcU2LFDVFQ== 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=1703061023; 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=YZorguoJgwUPBCxVdE6P9FQY9hLCmTj5Tcz9P0M+Gf8=; b=gLqCqRutuQ7LZH+YVzYPWpM6mjrSkNi9YlqL98Eeadfi+78GVizvqbLU4XnUudqGvroyJT Z2yrf5JvQGS8ozXcevPAsUNfVhIhLCn24koeHkyIDKCWnI9W82T/n6+6sJCdnGNxKCCPk4 nK1oFsHC+8oQWKenB/5nVutOeDnymyVCK/yzg6iqnhnouvU75wUuQwS1H+FEaGqiPxRk5j v5mTp8nq5sdbbjnireu5SDWXVcNBZPaSOj+UVF+m3RWzfkbnnh9zzSm3nPlVviSUrUHA4J EKCqxi9zjfDVxfiE2QlHKZdp3ZZGD/2OhqTNV7pxKCkI80C5WRhN1/ucB5iWdA== 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 4Sw6FW0ZNjzhFf; Wed, 20 Dec 2023 08:30:23 +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 3BK8UMH4033524; Wed, 20 Dec 2023 08:30:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BK8UMNx033521; Wed, 20 Dec 2023 08:30:22 GMT (envelope-from git) Date: Wed, 20 Dec 2023 08:30:22 GMT Message-Id: <202312200830.3BK8UMNx033521@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: ddb82f214f0c - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: ddb82f214f0cd5171f9830a6d28b75e8ded98613 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ddb82f214f0cd5171f9830a6d28b75e8ded98613 commit ddb82f214f0cd5171f9830a6d28b75e8ded98613 Author: Konstantin Belousov AuthorDate: 2023-12-11 22:57:28 +0000 Commit: Konstantin Belousov CommitDate: 2023-12-20 08:29:55 +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 2b11a15c46c9..c14cb5e1ee66 100644 --- a/sys/ufs/ffs/ffs_vnops.c +++ b/sys/ufs/ffs/ffs_vnops.c @@ -981,8 +981,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);