svn commit: r192238 -
user/kmacy/ZFS_MFC/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
Kip Macy
kmacy at FreeBSD.org
Sun May 17 01:32:48 UTC 2009
Author: kmacy
Date: Sun May 17 01:32:47 2009
New Revision: 192238
URL: http://svn.freebsd.org/changeset/base/192238
Log:
generalize assert as savestart implies savename
Modified:
user/kmacy/ZFS_MFC/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
Modified: user/kmacy/ZFS_MFC/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
==============================================================================
--- user/kmacy/ZFS_MFC/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Sun May 17 01:31:28 2009 (r192237)
+++ user/kmacy/ZFS_MFC/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Sun May 17 01:32:47 2009 (r192238)
@@ -4253,8 +4253,8 @@ zfs_freebsd_rename(ap)
vnode_t *tvp = ap->a_tvp;
int error;
- ASSERT(ap->a_fcnp->cn_flags & SAVENAME);
- ASSERT(ap->a_tcnp->cn_flags & SAVENAME);
+ ASSERT(ap->a_fcnp->cn_flags & (SAVENAME|SAVESTART));
+ ASSERT(ap->a_tcnp->cn_flags & (SAVENAME|SAVESTART));
error = zfs_rename(fdvp, ap->a_fcnp->cn_nameptr, tdvp,
ap->a_tcnp->cn_nameptr, ap->a_fcnp->cn_cred, NULL, 0);
More information about the svn-src-user
mailing list