diff options
| author | Tom Erickson <Tom.Erickson@Sun.COM> | 2009-11-09 20:45:32 -0800 |
|---|---|---|
| committer | Tom Erickson <Tom.Erickson@Sun.COM> | 2009-11-09 20:45:32 -0800 |
| commit | 92241e0b80813d0b83c08e730a29b9d1831794fc (patch) | |
| tree | ae911ea5f6928508430420730ad8dba20b5b3aa2 /usr/src/uts/common/fs/zfs/zfs_vfsops.c | |
| parent | 8d4cf8d8d2965ea43bccdc838f15c18634fee02d (diff) | |
| download | illumos-gate-92241e0b80813d0b83c08e730a29b9d1831794fc.tar.gz | |
PSARC 2009/510 ZFS received properties
6850025 want to preserve local properties for zfs_recv
6839260 want zfs send with properties
6855486 zfs_receive should keep trying to set properties even after some fail
6850030 snapshots on read-only dataset shouldn't affect zfs_receive
Diffstat (limited to 'usr/src/uts/common/fs/zfs/zfs_vfsops.c')
| -rw-r--r-- | usr/src/uts/common/fs/zfs/zfs_vfsops.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/usr/src/uts/common/fs/zfs/zfs_vfsops.c b/usr/src/uts/common/fs/zfs/zfs_vfsops.c index b72cb0ac3b..ec9d8334ff 100644 --- a/usr/src/uts/common/fs/zfs/zfs_vfsops.c +++ b/usr/src/uts/common/fs/zfs/zfs_vfsops.c @@ -1356,7 +1356,7 @@ zfs_mount_label_policy(vfs_t *vfsp, char *osname) if (l_to_str_internal(mnt_sl, &str) == 0 && dsl_prop_set(osname, zfs_prop_to_name(ZFS_PROP_MLSLABEL), - 1, strlen(str) + 1, str) == 0) + ZPROP_SRC_LOCAL, 1, strlen(str) + 1, str) == 0) retv = 0; if (str != NULL) kmem_free(str, strlen(str) + 1); |