From owner-svn-src-all@freebsd.org Fri Oct 23 15:50:50 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 5B5B944943A; Fri, 23 Oct 2020 15:50:50 +0000 (UTC) (envelope-from mjg@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CHpbt1skjz4HPC; Fri, 23 Oct 2020 15:50:50 +0000 (UTC) (envelope-from mjg@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 23AE09D19; Fri, 23 Oct 2020 15:50:50 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 09NFoool073861; Fri, 23 Oct 2020 15:50:50 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 09NFonDx073858; Fri, 23 Oct 2020 15:50:49 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202010231550.09NFonDx073858@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Fri, 23 Oct 2020 15:50:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r366975 - in head/sys: contrib/openzfs/module/os/freebsd/zfs fs/tmpfs ufs/ufs X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: in head/sys: contrib/openzfs/module/os/freebsd/zfs fs/tmpfs ufs/ufs X-SVN-Commit-Revision: 366975 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.33 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: Fri, 23 Oct 2020 15:50:50 -0000 Author: mjg Date: Fri Oct 23 15:50:49 2020 New Revision: 366975 URL: https://svnweb.freebsd.org/changeset/base/366975 Log: vfs: drop spurious cache_purge on rmdir The removed directory gets cache_purged which is sufficient to remove any entries related to the parent. Note only tmpfs, ufs and zfs are patched. Modified: head/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops.c head/sys/fs/tmpfs/tmpfs_vnops.c head/sys/ufs/ufs/ufs_vnops.c Modified: head/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops.c ============================================================================== --- head/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops.c Fri Oct 23 15:49:18 2020 (r366974) +++ head/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops.c Fri Oct 23 15:50:49 2020 (r366975) @@ -2332,8 +2332,6 @@ zfs_rmdir_(vnode_t *dvp, vnode_t *vp, const char *name return (error); } - cache_purge(dvp); - error = zfs_link_destroy(dzp, name, zp, tx, ZEXISTS, NULL); if (error == 0) { Modified: head/sys/fs/tmpfs/tmpfs_vnops.c ============================================================================== --- head/sys/fs/tmpfs/tmpfs_vnops.c Fri Oct 23 15:49:18 2020 (r366974) +++ head/sys/fs/tmpfs/tmpfs_vnops.c Fri Oct 23 15:50:49 2020 (r366975) @@ -1331,7 +1331,6 @@ tmpfs_rmdir(struct vop_rmdir_args *v) TMPFS_NODE_UNLOCK(dnode); if (tmpfs_use_nc(dvp)) { - cache_purge(dvp); cache_purge(vp); } Modified: head/sys/ufs/ufs/ufs_vnops.c ============================================================================== --- head/sys/ufs/ufs/ufs_vnops.c Fri Oct 23 15:49:18 2020 (r366974) +++ head/sys/ufs/ufs/ufs_vnops.c Fri Oct 23 15:50:49 2020 (r366975) @@ -2204,7 +2204,6 @@ ufs_rmdir(ap) softdep_revert_rmdir(dp, ip); goto out; } - cache_purge(dvp); /* * The only stuff left in the directory is "." and "..". The "." * reference is inconsequential since we are quashing it. The soft