From owner-dev-commits-src-main@freebsd.org Wed Feb 24 07:57:04 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E33DF5533FA; Wed, 24 Feb 2021 07:57:04 +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 4DlpCz72F5z4Ykh; Wed, 24 Feb 2021 07:57:03 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 E064928B53; Wed, 24 Feb 2021 07:57:02 +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 11O7v2M5045817; Wed, 24 Feb 2021 07:57:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 11O7v20J045816; Wed, 24 Feb 2021 07:57:02 GMT (envelope-from git) Date: Wed, 24 Feb 2021 07:57:02 GMT Message-Id: <202102240757.11O7v20J045816@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 6f30ac9995ff - main - Call softdep_prealloc() before taking ffs_lock_ea(), if unlock is committing 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/main X-Git-Reftype: branch X-Git-Commit: 6f30ac9995ff662a2fee5eda4cd87dd0f0e337ba Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Feb 2021 07:57:06 -0000 The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6f30ac9995ff662a2fee5eda4cd87dd0f0e337ba commit 6f30ac9995ff662a2fee5eda4cd87dd0f0e337ba Author: Konstantin Belousov AuthorDate: 2021-02-21 10:11:54 +0000 Commit: Konstantin Belousov CommitDate: 2021-02-24 07:55:21 +0000 Call softdep_prealloc() before taking ffs_lock_ea(), if unlock is committing softdep_prealloc() must be called to ensure enough journal space is available, before ffs_extwrite(). Also it must be done before taking ffs_lock_ea(), because it calls ffs_syncvnode(), potentially dropping the vnode lock. Reviewed by: mckusick Tested by: pho MFC after: 1 week Sponsored by: The FreeBSD Foundation --- sys/ufs/ffs/ffs_vnops.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/sys/ufs/ffs/ffs_vnops.c b/sys/ufs/ffs/ffs_vnops.c index 9be46951c04e..050a6f66be17 100644 --- a/sys/ufs/ffs/ffs_vnops.c +++ b/sys/ufs/ffs/ffs_vnops.c @@ -1552,6 +1552,12 @@ struct vop_closeextattr_args { if (ap->a_commit && (vp->v_mount->mnt_flag & MNT_RDONLY) != 0) return (EROFS); + if (ap->a_commit && DOINGSUJ(vp)) { + ASSERT_VOP_ELOCKED(vp, "ffs_closeextattr commit"); + softdep_prealloc(vp, MNT_WAIT); + if (vp->v_data == NULL) + return (EBADF); + } return (ffs_close_ea(vp, ap->a_commit, ap->a_cred, ap->a_td)); } @@ -1600,6 +1606,13 @@ vop_deleteextattr { return (error); } + if (DOINGSUJ(vp)) { + ASSERT_VOP_ELOCKED(vp, "ffs_deleteextattr"); + softdep_prealloc(vp, MNT_WAIT); + if (vp->v_data == NULL) + return (EBADF); + } + error = ffs_open_ea(vp, ap->a_cred, ap->a_td); if (error) return (error); @@ -1801,6 +1814,13 @@ vop_setextattr { return (error); } + if (DOINGSUJ(vp)) { + ASSERT_VOP_ELOCKED(vp, "ffs_deleteextattr"); + softdep_prealloc(vp, MNT_WAIT); + if (vp->v_data == NULL) + return (EBADF); + } + error = ffs_open_ea(vp, ap->a_cred, ap->a_td); if (error) return (error);