From owner-svn-src-all@freebsd.org Sun Jan 19 18:36:04 2020 Return-Path: Delivered-To: svn-src-all@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 840AB221BD9; Sun, 19 Jan 2020 18:36:04 +0000 (UTC) (envelope-from jeff@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4813Qr2pDsz4YNp; Sun, 19 Jan 2020 18:36:04 +0000 (UTC) (envelope-from jeff@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5704EF259; Sun, 19 Jan 2020 18:36:04 +0000 (UTC) (envelope-from jeff@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 00JIa4lb061072; Sun, 19 Jan 2020 18:36:04 GMT (envelope-from jeff@FreeBSD.org) Received: (from jeff@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00JIa4Rd061071; Sun, 19 Jan 2020 18:36:04 GMT (envelope-from jeff@FreeBSD.org) Message-Id: <202001191836.00JIa4Rd061071@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jeff set sender to jeff@FreeBSD.org using -f From: Jeff Roberson Date: Sun, 19 Jan 2020 18:36:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r356887 - head/sys/vm X-SVN-Group: head X-SVN-Commit-Author: jeff X-SVN-Commit-Paths: head/sys/vm X-SVN-Commit-Revision: 356887 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Jan 2020 18:36:04 -0000 Author: jeff Date: Sun Jan 19 18:36:03 2020 New Revision: 356887 URL: https://svnweb.freebsd.org/changeset/base/356887 Log: It has not been possible to recursively terminate a vnode object for some time now. Eliminate the dead code that supports it. Approved by: kib, markj Differential Revision: https://reviews.freebsd.org/D22908 Modified: head/sys/vm/vnode_pager.c Modified: head/sys/vm/vnode_pager.c ============================================================================== --- head/sys/vm/vnode_pager.c Sun Jan 19 18:30:23 2020 (r356886) +++ head/sys/vm/vnode_pager.c Sun Jan 19 18:36:03 2020 (r356887) @@ -200,36 +200,24 @@ vnode_destroy_vobject(struct vnode *vp) MPASS(obj->type == OBJT_VNODE); umtx_shm_object_terminated(obj); if (obj->ref_count == 0) { + KASSERT((obj->flags & OBJ_DEAD) == 0, + ("vnode_destroy_vobject: Terminating dead object")); + vm_object_set_flag(obj, OBJ_DEAD); + /* - * don't double-terminate the object + * Clean pages and flush buffers. */ - if ((obj->flags & OBJ_DEAD) == 0) { - vm_object_set_flag(obj, OBJ_DEAD); + vm_object_page_clean(obj, 0, 0, OBJPC_SYNC); + VM_OBJECT_WUNLOCK(obj); - /* - * Clean pages and flush buffers. - */ - vm_object_page_clean(obj, 0, 0, OBJPC_SYNC); - VM_OBJECT_WUNLOCK(obj); + vinvalbuf(vp, V_SAVE, 0, 0); - vinvalbuf(vp, V_SAVE, 0, 0); + BO_LOCK(&vp->v_bufobj); + vp->v_bufobj.bo_flag |= BO_DEAD; + BO_UNLOCK(&vp->v_bufobj); - BO_LOCK(&vp->v_bufobj); - vp->v_bufobj.bo_flag |= BO_DEAD; - BO_UNLOCK(&vp->v_bufobj); - - VM_OBJECT_WLOCK(obj); - vm_object_terminate(obj); - } else { - /* - * Waiters were already handled during object - * termination. The exclusive vnode lock hopefully - * prevented new waiters from referencing the dying - * object. - */ - vp->v_object = NULL; - VM_OBJECT_WUNLOCK(obj); - } + VM_OBJECT_WLOCK(obj); + vm_object_terminate(obj); } else { /* * Woe to the process that tries to page now :-).