From nobody Mon Feb 07 09:50:52 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 86EE319C1333; Mon, 7 Feb 2022 09:50:54 +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 4JshGh4Mcrz3sJP; Mon, 7 Feb 2022 09:50:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644227453; 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=mR/f2CVFj/yYNQfn2CQGcpmjfIvuOpZ8zj5FXhUmkl4=; b=lVvg+jG0mQ/RvUSGqG1V7eNFKfa94XpkR4mEomcMMaGhKqxTtPQElpHP2ZR0QrKODZgDIF PQyALXOp1ySy0OpBUx6zepWWDnrMFeDx8XSnSXhmuQjudvK7V4E6abZhV8lHLu7r4PtwZe MBDRA55RcT0zZOI4+pcppZoy2avnLLfPDb+EDznpAPkbpq5D0RhOBJ2k6wVyWgdOeD9/yr T55kk0fjGJuqzjUI5uCmeRo8u3DyjNBS/aJQHPT4V4L/KFafOlGwN4uTnVhuu4U+Z9AstY aeqMKLLs2t0bQrogoI6hPZY6OmCxR3cQ1MX9CWzMMWdNCajdMDy5yLf8YZDUIQ== 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 5088F23989; Mon, 7 Feb 2022 09:50:52 +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 2179oqQA059008; Mon, 7 Feb 2022 09:50:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2179oqmF059007; Mon, 7 Feb 2022 09:50:52 GMT (envelope-from git) Date: Mon, 7 Feb 2022 09:50:52 GMT Message-Id: <202202070950.2179oqmF059007@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: 7782d7167190 - stable/13 - syncer VOP_FSYNC(): unlock syncer vnode around call to VFS_SYNC() 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: 7782d71671908886b88a4d1d50732ab8bc95385e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644227453; 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=mR/f2CVFj/yYNQfn2CQGcpmjfIvuOpZ8zj5FXhUmkl4=; b=BVTz9FXkym3Z6Jq6Dv7x0cuZ1C7hlvciFkJ/MSVGFlAVDe+1GW8l3FArfReu091HfuOAx2 zqNCglGUcBe04jJUGwRcieyTbBz2D44wa1CswV6vXD1ZMmMiDAvCc9wWwYTs0PoIjiJ4V1 1zqbsCBRPgzMdb4r0NU6VUg3clZDlcmXR90rLS4RTOqhg/EWVXfhaJmyaEPYt0gpBgb5gH WW3oeDa6wylFFXmLxVQub91CmWi9zfZjEypntm7WdHhlEarbmON88Yx4j7MbJbTo37G+DJ hClROYLO3vWE/0J4Fed9PK5a9Jh5YiC5HEX8ckWPAxSVKSZQl2WTfBsCYEhovA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644227453; a=rsa-sha256; cv=none; b=J3i2vLYa2EgRzKsE5XjotJlk/42YXKIB1AC7o7anaSeNvjm5Y4poBkh+o9HcL16uCBEJXr lHu5VlS1UyC6/nq2EVrRFOE/NoWOpLjOOnD9WrnsMal8c2I2INPY7QCd5wI4can8FOlRak TYDlpJ11I1UqDFg+BsifLz8f5TFFMWOhdLwf6+/lGfssx68w5Ui827pZK+oHW+E5uB9kwX lfd5eUV32SonKfq4zO7LqcdbCKiFnZ2Gvjrvn+5ArE1TNmLp/lJEYdkk9nsHtQ503Ve1XQ M3Gg1vL300cMuUsGYXZSkdpWwoCFo/1EBrircNXnLZnZCF2C11ROvwkhD+cetw== 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=7782d71671908886b88a4d1d50732ab8bc95385e commit 7782d71671908886b88a4d1d50732ab8bc95385e Author: Konstantin Belousov AuthorDate: 2022-01-21 15:42:28 +0000 Commit: Konstantin Belousov CommitDate: 2022-02-07 09:38:50 +0000 syncer VOP_FSYNC(): unlock syncer vnode around call to VFS_SYNC() (cherry picked from commit 3d68c4e17578684cfdfd002fb6ab8554df525963) --- sys/kern/vfs_subr.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index f56bedecaf15..a7a432d31a55 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -5107,10 +5107,7 @@ sync_fsync(struct vop_fsync_args *ap) */ if (vfs_busy(mp, MBF_NOWAIT) != 0) return (0); - if (vn_start_write(NULL, &mp, V_NOWAIT) != 0) { - vfs_unbusy(mp); - return (0); - } + VOP_UNLOCK(syncvp); save = curthread_pflags_set(TDP_SYNCIO); /* * The filesystem at hand may be idle with free vnodes stored in the @@ -5119,7 +5116,7 @@ sync_fsync(struct vop_fsync_args *ap) vfs_periodic(mp, MNT_NOWAIT); error = VFS_SYNC(mp, MNT_LAZY); curthread_pflags_restore(save); - vn_finished_write(mp); + vn_lock(syncvp, LK_EXCLUSIVE | LK_RETRY); vfs_unbusy(mp); return (error); }