4039 zfs_rename()/zfs_link() needs stronger test for XDEV
Reviewed by: Gordon Ross <
[email protected]>
Reviewed by: Kevin Crowe <
[email protected]>
Reviewed by: Saso Kiselkov <
[email protected]>
Reviewed by: Matthew Ahrens <
[email protected]>
Approved by: Dan McDonald <
[email protected]>
--- a/usr/src/uts/common/fs/zfs/zfs_vnops.c Mon Nov 14 15:57:40 2011 -0800
+++ b/usr/src/uts/common/fs/zfs/zfs_vnops.c Tue Aug 13 07:32:14 2013 +0200
@@ -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 @@
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 @@
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),