svn commit: r192192 -
user/kmacy/ZFS_MFC/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
Kip Macy
kmacy at FreeBSD.org
Sat May 16 08:27:23 UTC 2009
Author: kmacy
Date: Sat May 16 08:27:23 2009
New Revision: 192192
URL: http://svn.freebsd.org/changeset/base/192192
Log:
don't assume snapshot is mounted on the control directory
Modified:
user/kmacy/ZFS_MFC/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
Modified: user/kmacy/ZFS_MFC/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
==============================================================================
--- user/kmacy/ZFS_MFC/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c Sat May 16 06:57:24 2009 (r192191)
+++ user/kmacy/ZFS_MFC/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c Sat May 16 08:27:23 2009 (r192192)
@@ -1078,14 +1078,11 @@ zfs_umount(vfs_t *vfsp, int fflag, kthre
if (zfsvfs->z_issnap) {
vnode_t *svp = vfsp->mnt_vnodecovered;
-#if 0
/*
- * I believe that this is incorrect for the
- * case of manually mounted snapshots
+ * We don't need an extra vn_rele if this is a manual snapshot mount
*/
- ASSERT(svp->v_count == 2);
-#endif
- VN_RELE(svp);
+ if (svp->v_count == 2)
+ VN_RELE(svp);
}
zfs_freevfs(vfsp);
More information about the svn-src-user
mailing list