From nobody Mon Feb 07 09:51:00 2022 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 F254A19C17E2; Mon, 7 Feb 2022 09:51:06 +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 4JshGw0HyWz3sfC; Mon, 7 Feb 2022 09:51:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644227466; 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=E4ca3iX2y77J3heAQRG6DDcdSK5VFEHp+MSTyb3r9oU=; b=PeFTr45XvBj3v8Bzlung4lg/hBlbkX7ytOsj/TTX3tPzWMhCcXt+LnaSnfJnPyiE/aX9F3 tSJ7bzE6ZHoZzBBYzRB/SELoCSoGfhntMOk+/1nwO2zYZ2LO9UikF0oC6qcIcgdiMmTuKO C/dcaK9qHVocY6lt7OfM+fo4kOea6DwPS4WIkK36XL3tpWEcX0IKVbDDve67C0lVn4t1VQ 2wTsQs/qbJ4GEG/LIqexFxfKN5qe+OvhOdctObxn9d1AgHtyZHpJh7Epw9jfzk9OOoHyeK 1P/pY6sqmaaoImiHTV7mqF8UKguJQiisd3bZqIg+vPEEQs/guMLGqrHKCdlX1A== 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 40660238CE; Mon, 7 Feb 2022 09:51:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2179p0tE059182; Mon, 7 Feb 2022 09:51:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2179p0FK059181; Mon, 7 Feb 2022 09:51:00 GMT (envelope-from git) Date: Mon, 7 Feb 2022 09:51:00 GMT Message-Id: <202202070951.2179p0FK059181@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: 7a3e533acb99 - stable/13 - ffs_read(): lock buffers after snaplk with LK_NOWITNESS 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: 7a3e533acb99bd5cbe663654a0bb6a6ad0af7883 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644227464; 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=E4ca3iX2y77J3heAQRG6DDcdSK5VFEHp+MSTyb3r9oU=; b=xMMd6SRT7kWwAVo8+dEaZDOTbkRk9kfrYOs63HldSjQ0uqVKAMyxOpvswmumhvIZ1mj4wQ hJRcw3G1RymgYBCBNTkdid8jkSBbrrLaNfKn7v1/GSSiIrvHmDG4lS4hgAKlh4DVYpqXfQ vUVzh4G981mFUG3tVSrKtpXM1elgaJOlTqq8nAMSuaTimNIj8ZfxCG+9XjlZGUHWc6sG5x NkXXHBv3YFhsLrnP7cUOU8gKzmWLGOX8oGncjUu5jYaVwkYQGJJRBp2JxRiXiJCz36KDPS BWqEEEGOsZrxKu0DetHekjbezBhjFr2LMre9pFOQ/3meRBC3PA8d088oLW97vw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644227464; a=rsa-sha256; cv=none; b=ZeyqfICF9QSV+CI3v4fzrkoF2lGS859LF18pZ9ZSQtF6vWaiXzrAv+JPiUzjPqX4G83Qq6 S58+EbKFWB61gFHkDzk88y4uZ33Yl5gL/mGCLmCtLlt9L5qD3IALdKLzMCOlKTyvwfa+9g 9EOkewPQlDR53cmZzNkofWA1UYJtxw5mjr55RMeXC2ToEHfzlGMdwrSkTD3iU7Y28Lx/ZQ 6V41HboMshx6T6K1z/OQs5U6eNRxEbeXvAsOmihoITBz5uquLV+VWz+ZqA7y6a2QgYIbkg JyOlhQmMAsmOyC/2f/v25MuztIZ8QOH6zgzNJ4QK1TSobqcrBeYaNe1UmBgOoA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=7a3e533acb99bd5cbe663654a0bb6a6ad0af7883 commit 7a3e533acb99bd5cbe663654a0bb6a6ad0af7883 Author: Konstantin Belousov AuthorDate: 2022-02-05 02:03:47 +0000 Commit: Konstantin Belousov CommitDate: 2022-02-07 09:38:50 +0000 ffs_read(): lock buffers after snaplk with LK_NOWITNESS (cherry picked from commit 0af463e6619cf9f7386129d427c244d3da30fa3a) --- sys/ufs/ffs/ffs_vnops.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/ufs/ffs/ffs_vnops.c b/sys/ufs/ffs/ffs_vnops.c index c2d6948dd140..1cfa6a91918f 100644 --- a/sys/ufs/ffs/ffs_vnops.c +++ b/sys/ufs/ffs/ffs_vnops.c @@ -695,6 +695,9 @@ ffs_read(ap) return (EOVERFLOW); bflag = GB_UNMAPPED | (uio->uio_segflg == UIO_NOCOPY ? 0 : GB_NOSPARSE); +#ifdef WITNESS + bflag |= IS_SNAPSHOT(ip) ? GB_NOWITNESS : 0; +#endif for (error = 0, bp = NULL; uio->uio_resid > 0; bp = NULL) { if ((bytesinfile = ip->i_size - uio->uio_offset) <= 0) break;