Author: delphij
Date: Fri Aug 16 19:23:44 2013
New Revision: 254420
URL: http://svnweb.freebsd.org/changeset/base/254420
Log:
Update vendor-sys/illumos/dist to illumos-gate 14133:4caa3904e52a:
Illumos ZFS issues:
4039 zfs_rename()/zfs_link() needs stronger test for XDEV
Modified:
vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_vnops.c
Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_vnops.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_vnops.c Fri Aug 16
18:47:18 2013 (r254419)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_vnops.c Fri Aug 16
19:23:44 2013 (r254420)
@@ -21,6 +21,7 @@
/*
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright 2013 Nexenta Systems, Inc. All rights reserved.
*/
/* Portions Copyright 2007 Jeremy Teo */
@@ -3372,13 +3373,18 @@ zfs_rename(vnode_t *sdvp, char *snm, vno
if (VOP_REALVP(tdvp, &realvp, ct) == 0)
tdvp = realvp;
- if (tdvp->v_vfsp != sdvp->v_vfsp || zfsctl_is_node(tdvp)) {
+ tdzp = VTOZ(tdvp);
+ ZFS_VERIFY_ZP(tdzp);
+
+ /*
+ * We check z_zfsvfs rather than v_vfsp here, because snapshots and the
+ * ctldir appear to have the same v_vfsp.
+ */
+ if (tdzp->z_zfsvfs != zfsvfs || zfsctl_is_node(tdvp)) {
ZFS_EXIT(zfsvfs);
return (SET_ERROR(EXDEV));
}
- tdzp = VTOZ(tdvp);
- ZFS_VERIFY_ZP(tdzp);
if (zfsvfs->z_utf8 && u8_validate(tnm,
strlen(tnm), NULL, U8_VALIDATE_ENTIRE, &error) < 0) {
ZFS_EXIT(zfsvfs);
@@ -3923,14 +3929,18 @@ zfs_link(vnode_t *tdvp, vnode_t *svp, ch
return (SET_ERROR(EPERM));
}
- if (svp->v_vfsp != tdvp->v_vfsp || zfsctl_is_node(svp)) {
+ szp = VTOZ(svp);
+ ZFS_VERIFY_ZP(szp);
+
+ /*
+ * We check z_zfsvfs rather than v_vfsp here, because snapshots and the
+ * ctldir appear to have the same v_vfsp.
+ */
+ if (szp->z_zfsvfs != zfsvfs || zfsctl_is_node(svp)) {
ZFS_EXIT(zfsvfs);
return (SET_ERROR(EXDEV));
}
- szp = VTOZ(svp);
- ZFS_VERIFY_ZP(szp);
-
/* Prevent links to .zfs/shares files */
if ((error = sa_lookup(szp->z_sa_hdl, SA_ZPL_PARENT(zfsvfs),
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
