diff options
| author | delphij <delphij@FreeBSD.org> | 2014-03-20 00:28:53 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2014-03-20 00:28:53 +0000 |
| commit | ec5d67aa46e2c8259141fe7898d67f24a6f1bda6 (patch) | |
| tree | dddfb59ee71d89633288f659589644655a5f227d /sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c | |
| parent | 11b0e21c7539d9eb21846d2b962f24a3c1716d01 (diff) | |
| download | FreeBSD-src-ec5d67aa46e2c8259141fe7898d67f24a6f1bda6.zip FreeBSD-src-ec5d67aa46e2c8259141fe7898d67f24a6f1bda6.tar.gz | |
MFC r260183: MFV r260154 + 260182:
4369 implement zfs bookmarks
4368 zfs send filesystems from readonly pools
Illumos/illumos-gate@78f171005391b928aaf1642b3206c534ed644332
Diffstat (limited to 'sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c')
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c index 28ab1fa..3cc70b2 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c @@ -643,7 +643,7 @@ zfsctl_snapshot_zname(vnode_t *vp, const char *name, int len, char *zname) { objset_t *os = ((zfsvfs_t *)((vp)->v_vfsp->vfs_data))->z_os; - if (snapshot_namecheck(name, NULL, NULL) != 0) + if (zfs_component_namecheck(name, NULL, NULL) != 0) return (SET_ERROR(EILSEQ)); dmu_objset_name(os, zname); if (strlen(zname) + 1 + strlen(name) >= len) @@ -884,7 +884,7 @@ zfsctl_snapdir_mkdir(vnode_t *dvp, char *dirname, vattr_t *vap, vnode_t **vpp, static enum symfollow follow = NO_FOLLOW; static enum uio_seg seg = UIO_SYSSPACE; - if (snapshot_namecheck(dirname, NULL, NULL) != 0) + if (zfs_component_namecheck(dirname, NULL, NULL) != 0) return (SET_ERROR(EILSEQ)); dmu_objset_name(zfsvfs->z_os, name); |
