Skip to content

Commit

Permalink
6939941 problem with moving files in zfs
Browse files Browse the repository at this point in the history
References:
  illumos/illumos-gate@d39ee14

Ported-by: Richard Yao <ryao@gentoo.org>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Issue openzfs#1775

Porting notes:

1. This commit was so old that only two lines applied to the modern
   code base.
  • Loading branch information
Mark Shellenbaum authored and unya committed Dec 13, 2013
1 parent 0ce5400 commit aec7411
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions module/zfs/zfs_vnops.c
Expand Up @@ -3174,7 +3174,7 @@ zfs_rename(struct inode *sdip, char *snm, struct inode *tdip, char *tnm,
ZFS_VERIFY_ZP(sdzp);
zilog = zsb->z_log;

if (tdip->i_sb != sdip->i_sb) {
if (tdip->i_sb != sdip->i_sb || zfsctl_is_node(tdip)) {
ZFS_EXIT(zsb);
return (SET_ERROR(EXDEV));
}
Expand Down Expand Up @@ -3716,7 +3716,7 @@ zfs_link(struct inode *tdip, struct inode *sip, char *name, cred_t *cr)
return (SET_ERROR(EPERM));
}

if (sip->i_sb != tdip->i_sb) {
if (sip->i_sb != tdip->i_sb || zfsctl_is_node(sip)) {
ZFS_EXIT(zsb);
return (SET_ERROR(EXDEV));
}
Expand Down

0 comments on commit aec7411

Please sign in to comment.