From owner-svn-src-all@FreeBSD.ORG Sun Sep 20 13:28:30 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 250601065676; Sun, 20 Sep 2009 13:28:30 +0000 (UTC) (envelope-from pjd@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 135188FC15; Sun, 20 Sep 2009 13:28:30 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n8KDSTAF057872; Sun, 20 Sep 2009 13:28:29 GMT (envelope-from pjd@svn.freebsd.org) Received: (from pjd@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n8KDST3f057869; Sun, 20 Sep 2009 13:28:29 GMT (envelope-from pjd@svn.freebsd.org) Message-Id: <200909201328.n8KDST3f057869@svn.freebsd.org> From: Pawel Jakub Dawidek Date: Sun, 20 Sep 2009 13:28:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r197351 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 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, 20 Sep 2009 13:28:30 -0000 Author: pjd Date: Sun Sep 20 13:28:29 2009 New Revision: 197351 URL: http://svn.freebsd.org/changeset/base/197351 Log: Purge namecache in the same place OpenSolaris does. Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c ============================================================================== --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c Sun Sep 20 13:28:19 2009 (r197350) +++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c Sun Sep 20 13:28:29 2009 (r197351) @@ -2354,9 +2354,6 @@ zfs_ioc_rollback(zfs_cmd_t *zc) if (error == 0) { int resume_err; -#ifdef FREEBSD_NAMECACHE - cache_purgevfs(zfsvfs->z_vfs); -#endif ASSERT(strcmp(osname, zc->zc_name) == 0); error = dmu_objset_rollback(os); resume_err = zfs_resume_fs(zfsvfs, osname, mode); @@ -2543,9 +2540,6 @@ zfs_ioc_recv(zfs_cmd_t *zc) if (error == 0) { int resume_err; -#ifdef FREEBSD_NAMECACHE - cache_purgevfs(zfsvfs->z_vfs); -#endif error = dmu_recv_end(&drc); resume_err = zfs_resume_fs(zfsvfs, osname, mode); error = error ? error : resume_err; Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c ============================================================================== --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c Sun Sep 20 13:28:19 2009 (r197350) +++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c Sun Sep 20 13:28:29 2009 (r197351) @@ -898,6 +898,9 @@ zfsvfs_teardown(zfsvfs_t *zfsvfs, boolea * 'z_parent' is self referential for non-snapshots. */ (void) dnlc_purge_vfsp(zfsvfs->z_parent->z_vfs, 0); +#ifdef FREEBSD_NAMECACHE + cache_purgevfs(zfsvfs->z_parent->z_vfs); +#endif } /*