diff options
| author | Matt Macy <mmacy@FreeBSD.org> | 2020-09-04 22:25:14 +0000 |
|---|---|---|
| committer | Matt Macy <mmacy@FreeBSD.org> | 2020-09-04 22:25:14 +0000 |
| commit | eac7052fdebb90caf2f653e06187bdbca837b9c7 (patch) | |
| tree | 7239679d0ef872f6768f57c2ae6e6db54576013d /sys/contrib/openzfs/module/zfs/dsl_dir.c | |
| parent | 46b974a9dbc08c432385b68092b7e34b683c38e1 (diff) | |
| parent | b0a96e5e2d3c9480ec89dd4c034c7fe4f97abfe1 (diff) | |
| download | src-eac7052fdebb90caf2f653e06187bdbca837b9c7.tar.gz src-eac7052fdebb90caf2f653e06187bdbca837b9c7.zip | |
ZFS: MFV 2.0-rc1-gfd20a8
- fixes jail delegation
- fixes raw kstat unsupported complaints
- exposes dbgmsg, dbuf, and checksum benchmark stats
- restore rename -u support
Notes
Notes:
svn path=/head/; revision=365347
Diffstat (limited to 'sys/contrib/openzfs/module/zfs/dsl_dir.c')
| -rw-r--r-- | sys/contrib/openzfs/module/zfs/dsl_dir.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/contrib/openzfs/module/zfs/dsl_dir.c b/sys/contrib/openzfs/module/zfs/dsl_dir.c index 29672e9a613e..90dd787023be 100644 --- a/sys/contrib/openzfs/module/zfs/dsl_dir.c +++ b/sys/contrib/openzfs/module/zfs/dsl_dir.c @@ -46,14 +46,12 @@ #include <sys/sunddi.h> #include <sys/zfeature.h> #include <sys/policy.h> +#include <sys/zfs_vfsops.h> #include <sys/zfs_znode.h> #include <sys/zvol.h> #include <sys/zthr.h> #include "zfs_namecheck.h" #include "zfs_prop.h" -#ifdef _KERNEL -#include <sys/zfs_vfsops.h> -#endif /* * Filesystem and Snapshot Limits @@ -2124,6 +2122,8 @@ dsl_dir_rename_sync(void *arg, dmu_tx_t *tx) VERIFY0(zap_add(mos, dsl_dir_phys(newparent)->dd_child_dir_zapobj, dd->dd_myname, 8, 1, &dd->dd_object, tx)); + /* TODO: A rename callback to avoid these layering violations. */ + zfsvfs_update_fromname(ddra->ddra_oldname, ddra->ddra_newname); zvol_rename_minors(dp->dp_spa, ddra->ddra_oldname, ddra->ddra_newname, B_TRUE); |