From owner-svn-src-all@freebsd.org Thu Aug 20 10:05:47 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 ED0693B918B; Thu, 20 Aug 2020 10:05:47 +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 4BXKzH65xWz4DT4; Thu, 20 Aug 2020 10:05:47 +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 B6574127B2; Thu, 20 Aug 2020 10:05:47 +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 07KA5lSI042131; Thu, 20 Aug 2020 10:05:47 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07KA5kMu042125; Thu, 20 Aug 2020 10:05:46 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202008201005.07KA5kMu042125@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Thu, 20 Aug 2020 10:05:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r364419 - in head/sys: fs/tmpfs kern sys ufs/ufs X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: in head/sys: fs/tmpfs kern sys ufs/ufs X-SVN-Commit-Revision: 364419 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: Thu, 20 Aug 2020 10:05:48 -0000 Author: mjg Date: Thu Aug 20 10:05:46 2020 New Revision: 364419 URL: https://svnweb.freebsd.org/changeset/base/364419 Log: cache: add cache_rename, a dedicated helper to use for renames While here make both tmpfs and ufs use it. No fuctional changes. Modified: head/sys/fs/tmpfs/tmpfs_vnops.c head/sys/kern/vfs_cache.c head/sys/sys/vnode.h head/sys/ufs/ufs/ufs_vnops.c Modified: head/sys/fs/tmpfs/tmpfs_vnops.c ============================================================================== --- head/sys/fs/tmpfs/tmpfs_vnops.c Thu Aug 20 10:05:19 2020 (r364418) +++ head/sys/fs/tmpfs/tmpfs_vnops.c Thu Aug 20 10:05:46 2020 (r364419) @@ -1144,10 +1144,7 @@ tmpfs_rename(struct vop_rename_args *v) tmpfs_dir_attach(tdvp, de); if (tmpfs_use_nc(fvp)) { - cache_purge(fvp); - if (tvp != NULL) - cache_purge(tvp); - cache_purge_negative(tdvp); + cache_rename(fdvp, fvp, tdvp, tvp, fcnp, tcnp); } error = 0; Modified: head/sys/kern/vfs_cache.c ============================================================================== --- head/sys/kern/vfs_cache.c Thu Aug 20 10:05:19 2020 (r364418) +++ head/sys/kern/vfs_cache.c Thu Aug 20 10:05:46 2020 (r364419) @@ -2339,6 +2339,23 @@ cache_purge_negative(struct vnode *vp) } } +void +cache_rename(struct vnode *fdvp, struct vnode *fvp, struct vnode *tdvp, + struct vnode *tvp, struct componentname *fcnp, struct componentname *tcnp) +{ + + ASSERT_VOP_IN_SEQC(fdvp); + ASSERT_VOP_IN_SEQC(fvp); + ASSERT_VOP_IN_SEQC(tdvp); + if (tvp != NULL) + ASSERT_VOP_IN_SEQC(tvp); + + cache_purge(fvp); + if (tvp != NULL) + cache_purge(tvp); + cache_purge_negative(tdvp); +} + /* * Flush all entries referencing a particular filesystem. */ Modified: head/sys/sys/vnode.h ============================================================================== --- head/sys/sys/vnode.h Thu Aug 20 10:05:19 2020 (r364418) +++ head/sys/sys/vnode.h Thu Aug 20 10:05:46 2020 (r364419) @@ -642,6 +642,8 @@ void cache_vnode_init(struct vnode *vp); void cache_purge(struct vnode *vp); void cache_purge_vgone(struct vnode *vp); void cache_purge_negative(struct vnode *vp); +void cache_rename(struct vnode *fdvp, struct vnode *fvp, struct vnode *tdvp, + struct vnode *tvp, struct componentname *fcnp, struct componentname *tcnp); void cache_purgevfs(struct mount *mp, bool force); int change_dir(struct vnode *vp, struct thread *td); void cvtstat(struct stat *st, struct ostat *ost); Modified: head/sys/ufs/ufs/ufs_vnops.c ============================================================================== --- head/sys/ufs/ufs/ufs_vnops.c Thu Aug 20 10:05:19 2020 (r364418) +++ head/sys/ufs/ufs/ufs_vnops.c Thu Aug 20 10:05:46 2020 (r364419) @@ -1629,10 +1629,7 @@ relock: * name that references the old i-node if it has other links * or open file descriptors. */ - cache_purge(fvp); - if (tvp) - cache_purge(tvp); - cache_purge_negative(tdvp); + cache_rename(fdvp, fvp, tdvp, tvp, fcnp, tcnp); unlockout: if (want_seqc_end) {