diff options
Diffstat (limited to 'usr/src')
83 files changed, 1273 insertions, 3 deletions
diff --git a/usr/src/cmd/zdb/zdb.c b/usr/src/cmd/zdb/zdb.c index 5746d6492a..4d609a7870 100644 --- a/usr/src/cmd/zdb/zdb.c +++ b/usr/src/cmd/zdb/zdb.c @@ -22,6 +22,7 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2011, 2015 by Delphix. All rights reserved. + * Copyright (c) 2014 Integros [integros.com] */ #include <stdio.h> diff --git a/usr/src/cmd/zfs/zfs_main.c b/usr/src/cmd/zfs/zfs_main.c index f9fa9ceb64..8ebe2b5f94 100644 --- a/usr/src/cmd/zfs/zfs_main.c +++ b/usr/src/cmd/zfs/zfs_main.c @@ -26,6 +26,7 @@ * Copyright (c) 2012, Joyent, Inc. All rights reserved. * Copyright (c) 2013 Steven Hartland. All rights reserved. * Copyright 2013 Nexenta Systems, Inc. All rights reserved. + * Copyright (c) 2014 Integros [integros.com] */ #include <assert.h> diff --git a/usr/src/cmd/zstreamdump/zstreamdump.c b/usr/src/cmd/zstreamdump/zstreamdump.c index 4d884c74e7..3b390a4663 100644 --- a/usr/src/cmd/zstreamdump/zstreamdump.c +++ b/usr/src/cmd/zstreamdump/zstreamdump.c @@ -26,6 +26,7 @@ /* * Copyright (c) 2013, 2014 by Delphix. All rights reserved. + * Copyright (c) 2014 Integros [integros.com] */ #include <ctype.h> diff --git a/usr/src/cmd/ztest/ztest.c b/usr/src/cmd/ztest/ztest.c index 764008f5b8..0b238eba6f 100644 --- a/usr/src/cmd/ztest/ztest.c +++ b/usr/src/cmd/ztest/ztest.c @@ -23,6 +23,7 @@ * Copyright (c) 2011, 2015 by Delphix. All rights reserved. * Copyright 2011 Nexenta Systems, Inc. All rights reserved. * Copyright (c) 2013 Steven Hartland. All rights reserved. + * Copyright (c) 2014 Integros [integros.com] */ /* diff --git a/usr/src/common/zfs/zfeature_common.c b/usr/src/common/zfs/zfeature_common.c index a001255289..1c80f2fcac 100644 --- a/usr/src/common/zfs/zfeature_common.c +++ b/usr/src/common/zfs/zfeature_common.c @@ -24,6 +24,7 @@ * Copyright (c) 2013 by Saso Kiselkov. All rights reserved. * Copyright (c) 2013, Joyent, Inc. All rights reserved. * Copyright (c) 2014, Nexenta Systems, Inc. All rights reserved. + * Copyright (c) 2014 Integros [integros.com] */ #ifdef _KERNEL diff --git a/usr/src/common/zfs/zfeature_common.h b/usr/src/common/zfs/zfeature_common.h index 6b229aebc4..528ff42bb0 100644 --- a/usr/src/common/zfs/zfeature_common.h +++ b/usr/src/common/zfs/zfeature_common.h @@ -23,6 +23,7 @@ * Copyright (c) 2011, 2015 by Delphix. All rights reserved. * Copyright (c) 2013 by Saso Kiselkov. All rights reserved. * Copyright (c) 2013, Joyent, Inc. All rights reserved. + * Copyright (c) 2014 Integros [integros.com] */ #ifndef _ZFEATURE_COMMON_H diff --git a/usr/src/common/zfs/zfs_prop.c b/usr/src/common/zfs/zfs_prop.c index f9f3d39e6c..68b2bba2ef 100644 --- a/usr/src/common/zfs/zfs_prop.c +++ b/usr/src/common/zfs/zfs_prop.c @@ -23,6 +23,7 @@ * Copyright (c) 2011, 2014 by Delphix. All rights reserved. * Copyright (c) 2013 by Saso Kiselkov. All rights reserved. * Copyright (c) 2013, Joyent, Inc. All rights reserved. + * Copyright (c) 2014 Integros [integros.com] */ /* Portions Copyright 2010 Robert Milkowski */ diff --git a/usr/src/common/zfs/zpool_prop.c b/usr/src/common/zfs/zpool_prop.c index 4d906b02bc..9c717442ed 100644 --- a/usr/src/common/zfs/zpool_prop.c +++ b/usr/src/common/zfs/zpool_prop.c @@ -22,6 +22,7 @@ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2011 Nexenta Systems, Inc. All rights reserved. * Copyright (c) 2012, 2014 by Delphix. All rights reserved. + * Copyright (c) 2014 Integros [integros.com] */ #include <sys/zio.h> diff --git a/usr/src/grub/grub-0.97/stage2/fsys_zfs.c b/usr/src/grub/grub-0.97/stage2/fsys_zfs.c index f9bc6fda49..5c3cf6c786 100644 --- a/usr/src/grub/grub-0.97/stage2/fsys_zfs.c +++ b/usr/src/grub/grub-0.97/stage2/fsys_zfs.c @@ -25,6 +25,7 @@ /* * Copyright (c) 2012, 2015 by Delphix. All rights reserved. * Copyright (c) 2013 by Saso Kiselkov. All rights reserved. + * Copyright (c) 2014 Integros [integros.com] */ /* diff --git a/usr/src/grub/grub-0.97/stage2/zfs-include/spa.h b/usr/src/grub/grub-0.97/stage2/zfs-include/spa.h index deb52cfda3..822f67c923 100644 --- a/usr/src/grub/grub-0.97/stage2/zfs-include/spa.h +++ b/usr/src/grub/grub-0.97/stage2/zfs-include/spa.h @@ -24,6 +24,7 @@ /* * Copyright (c) 2013 by Delphix. All rights reserved. + * Copyright (c) 2014 Integros [integros.com] */ #ifndef _SYS_SPA_H diff --git a/usr/src/lib/libzfs/common/libzfs.h b/usr/src/lib/libzfs/common/libzfs.h index 0125d9884f..b369b18671 100644 --- a/usr/src/lib/libzfs/common/libzfs.h +++ b/usr/src/lib/libzfs/common/libzfs.h @@ -25,6 +25,7 @@ * Copyright (c) 2012, Joyent, Inc. All rights reserved. * Copyright (c) 2013 Steven Hartland. All rights reserved. * Copyright 2013 Nexenta Systems, Inc. All rights reserved. + * Copyright (c) 2014 Integros [integros.com] */ #ifndef _LIBZFS_H diff --git a/usr/src/lib/libzfs/common/libzfs_dataset.c b/usr/src/lib/libzfs/common/libzfs_dataset.c index d282b0d9a5..034edebb24 100644 --- a/usr/src/lib/libzfs/common/libzfs_dataset.c +++ b/usr/src/lib/libzfs/common/libzfs_dataset.c @@ -27,6 +27,7 @@ * Copyright (c) 2013 Martin Matuska. All rights reserved. * Copyright (c) 2013 Steven Hartland. All rights reserved. * Copyright 2013 Nexenta Systems, Inc. All rights reserved. + * Copyright (c) 2014 Integros [integros.com] */ #include <ctype.h> diff --git a/usr/src/lib/libzfs/common/libzfs_sendrecv.c b/usr/src/lib/libzfs/common/libzfs_sendrecv.c index bc91979bee..ef659ff000 100644 --- a/usr/src/lib/libzfs/common/libzfs_sendrecv.c +++ b/usr/src/lib/libzfs/common/libzfs_sendrecv.c @@ -25,6 +25,7 @@ * Copyright (c) 2012, Joyent, Inc. All rights reserved. * Copyright (c) 2013 Steven Hartland. All rights reserved. * Copyright 2015, OmniTI Computer Consulting, Inc. All rights reserved. + * Copyright (c) 2014 Integros [integros.com] */ #include <assert.h> diff --git a/usr/src/lib/libzfs_core/common/libzfs_core.c b/usr/src/lib/libzfs_core/common/libzfs_core.c index 1013cf0d5f..76a0798d6b 100644 --- a/usr/src/lib/libzfs_core/common/libzfs_core.c +++ b/usr/src/lib/libzfs_core/common/libzfs_core.c @@ -22,6 +22,7 @@ /* * Copyright (c) 2012, 2014 by Delphix. All rights reserved. * Copyright (c) 2013 Steven Hartland. All rights reserved. + * Copyright (c) 2014 Integros [integros.com] */ /* diff --git a/usr/src/lib/libzfs_core/common/libzfs_core.h b/usr/src/lib/libzfs_core/common/libzfs_core.h index d2d79175f6..938afbbc8f 100644 --- a/usr/src/lib/libzfs_core/common/libzfs_core.h +++ b/usr/src/lib/libzfs_core/common/libzfs_core.h @@ -21,6 +21,7 @@ /* * Copyright (c) 2012, 2014 by Delphix. All rights reserved. + * Copyright (c) 2014 Integros [integros.com] */ #ifndef _LIBZFS_CORE_H diff --git a/usr/src/man/man1m/zfs.1m b/usr/src/man/man1m/zfs.1m index 7300fa6396..f34357003e 100644 --- a/usr/src/man/man1m/zfs.1m +++ b/usr/src/man/man1m/zfs.1m @@ -26,6 +26,7 @@ .\" Copyright (c) 2015, Joyent, Inc. All rights reserved. .\" Copyright (c) 2014 by Adam Stevko. All rights reserved. .\" Copyright 2015 Nexenta Systems, Inc. All Rights Reserved. +.\" Copyright (c) 2014 Integros [integros.com] .\" .Dd June 8, 2015 .Dt ZFS 1M diff --git a/usr/src/man/man5/zpool-features.5 b/usr/src/man/man5/zpool-features.5 index a80fc3479e..cc94fa1014 100644 --- a/usr/src/man/man5/zpool-features.5 +++ b/usr/src/man/man5/zpool-features.5 @@ -2,6 +2,7 @@ .\" Copyright (c) 2012, 2015 by Delphix. All rights reserved. .\" Copyright (c) 2013 by Saso Kiselkov. All rights reserved. .\" Copyright (c) 2014, Joyent, Inc. All rights reserved. +.\" Copyright (c) 2014 Integros [integros.com] .\" The contents of this file are subject to the terms of the Common Development .\" and Distribution License (the "License"). You may not use this file except .\" in compliance with the License. You can obtain a copy of the license at diff --git a/usr/src/pkg/manifests/system-test-zfstest.mf b/usr/src/pkg/manifests/system-test-zfstest.mf index 61fe6c615a..0605ab6c6d 100644 --- a/usr/src/pkg/manifests/system-test-zfstest.mf +++ b/usr/src/pkg/manifests/system-test-zfstest.mf @@ -12,7 +12,7 @@ # # Copyright (c) 2012, 2015 by Delphix. All rights reserved. # Copyright 2014, OmniTI Computer Consulting, Inc. All rights reserved. -# Copyright 2015, Nexenta Systems Inc. All rights reserved. +# Copyright 2015 Nexenta Systems, Inc. All rights reserved. # set name=pkg.fmri value=pkg:/system/test/zfstest@$(PKGVERS) @@ -35,6 +35,7 @@ dir path=opt/zfs-tests/tests/functional/atime dir path=opt/zfs-tests/tests/functional/bootfs dir path=opt/zfs-tests/tests/functional/cache dir path=opt/zfs-tests/tests/functional/cachefile +dir path=opt/zfs-tests/tests/functional/casenorm dir path=opt/zfs-tests/tests/functional/checksum dir path=opt/zfs-tests/tests/functional/clean_mirror dir path=opt/zfs-tests/tests/functional/cli_root @@ -328,6 +329,36 @@ file path=opt/zfs-tests/tests/functional/cachefile/cachefile_001_pos mode=0555 file path=opt/zfs-tests/tests/functional/cachefile/cachefile_002_pos mode=0555 file path=opt/zfs-tests/tests/functional/cachefile/cachefile_003_pos mode=0555 file path=opt/zfs-tests/tests/functional/cachefile/cachefile_004_pos mode=0555 +file path=opt/zfs-tests/tests/functional/casenorm/case_all_values mode=0555 +file path=opt/zfs-tests/tests/functional/casenorm/casenorm.cfg mode=0444 +file path=opt/zfs-tests/tests/functional/casenorm/casenorm.kshlib mode=0444 +file path=opt/zfs-tests/tests/functional/casenorm/cleanup mode=0555 +file path=opt/zfs-tests/tests/functional/casenorm/insensitive_formd_delete \ + mode=0555 +file path=opt/zfs-tests/tests/functional/casenorm/insensitive_formd_lookup \ + mode=0555 +file path=opt/zfs-tests/tests/functional/casenorm/insensitive_none_delete \ + mode=0555 +file path=opt/zfs-tests/tests/functional/casenorm/insensitive_none_lookup \ + mode=0555 +file path=opt/zfs-tests/tests/functional/casenorm/mixed_formd_delete mode=0555 +file path=opt/zfs-tests/tests/functional/casenorm/mixed_formd_lookup mode=0555 +file path=opt/zfs-tests/tests/functional/casenorm/mixed_formd_lookup_ci \ + mode=0555 +file path=opt/zfs-tests/tests/functional/casenorm/mixed_none_delete mode=0555 +file path=opt/zfs-tests/tests/functional/casenorm/mixed_none_lookup mode=0555 +file path=opt/zfs-tests/tests/functional/casenorm/mixed_none_lookup_ci \ + mode=0555 +file path=opt/zfs-tests/tests/functional/casenorm/norm_all_values mode=0555 +file path=opt/zfs-tests/tests/functional/casenorm/sensitive_formd_delete \ + mode=0555 +file path=opt/zfs-tests/tests/functional/casenorm/sensitive_formd_lookup \ + mode=0555 +file path=opt/zfs-tests/tests/functional/casenorm/sensitive_none_delete \ + mode=0555 +file path=opt/zfs-tests/tests/functional/casenorm/sensitive_none_lookup \ + mode=0555 +file path=opt/zfs-tests/tests/functional/casenorm/setup mode=0555 $(i386_ONLY)file path=opt/zfs-tests/tests/functional/checksum/edonr_test.amd64 \ mode=0555 $(i386_ONLY)file path=opt/zfs-tests/tests/functional/checksum/edonr_test.i386 \ diff --git a/usr/src/test/zfs-tests/include/commands.cfg b/usr/src/test/zfs-tests/include/commands.cfg index 7f9e7f34c6..adcd697b05 100644 --- a/usr/src/test/zfs-tests/include/commands.cfg +++ b/usr/src/test/zfs-tests/include/commands.cfg @@ -155,6 +155,7 @@ export ZDB="/usr/sbin/zdb" export ZFS="/usr/sbin/zfs" export ZHACK="/usr/sbin/zhack" export ZLOGIN="/usr/sbin/zlogin" +export ZLOOK="/usr/bin/zlook" export ZONEADM="/usr/sbin/zoneadm" export ZONECFG="/usr/sbin/zonecfg" export ZONENAME="/usr/bin/zonename" diff --git a/usr/src/test/zfs-tests/runfiles/delphix.run b/usr/src/test/zfs-tests/runfiles/delphix.run index 475a42969e..091fb22954 100644 --- a/usr/src/test/zfs-tests/runfiles/delphix.run +++ b/usr/src/test/zfs-tests/runfiles/delphix.run @@ -72,6 +72,15 @@ tests = ['cachefile_001_pos', 'cachefile_002_pos', 'cachefile_003_pos', pre = post = +[/opt/zfs-tests/tests/functional/casenorm] +tests = ['case_all_values', 'norm_all_values', + 'sensitive_none_lookup', 'sensitive_none_delete', + 'sensitive_formd_lookup', 'sensitive_formd_delete', + 'insensitive_none_lookup', 'insensitive_none_delete', + 'insensitive_formd_lookup', 'insensitive_formd_delete', + 'mixed_none_lookup', 'mixed_none_lookup_ci', 'mixed_none_delete', + 'mixed_formd_lookup', 'mixed_formd_lookup_ci', 'mixed_formd_delete'] + [/opt/zfs-tests/tests/functional/checksum] tests = ['run_edonr_test', 'run_sha2_test', 'run_skein_test'] pre = diff --git a/usr/src/test/zfs-tests/runfiles/omnios.run b/usr/src/test/zfs-tests/runfiles/omnios.run index 5b030f3390..4db1db32a5 100644 --- a/usr/src/test/zfs-tests/runfiles/omnios.run +++ b/usr/src/test/zfs-tests/runfiles/omnios.run @@ -72,6 +72,15 @@ tests = ['cachefile_001_pos', 'cachefile_002_pos', 'cachefile_003_pos', pre = post = +[/opt/zfs-tests/tests/functional/casenorm] +tests = ['case_all_values', 'norm_all_values', + 'sensitive_none_lookup', 'sensitive_none_delete', + 'sensitive_formd_lookup', 'sensitive_formd_delete', + 'insensitive_none_lookup', 'insensitive_none_delete', + 'insensitive_formd_lookup', 'insensitive_formd_delete', + 'mixed_none_lookup', 'mixed_none_lookup_ci', 'mixed_none_delete', + 'mixed_formd_lookup', 'mixed_formd_lookup_ci', 'mixed_formd_delete'] + [/opt/zfs-tests/tests/functional/checksum] tests = ['run_edonr_test', 'run_sha2_test', 'run_skein_test'] pre = diff --git a/usr/src/test/zfs-tests/runfiles/openindiana.run b/usr/src/test/zfs-tests/runfiles/openindiana.run index 475a42969e..091fb22954 100644 --- a/usr/src/test/zfs-tests/runfiles/openindiana.run +++ b/usr/src/test/zfs-tests/runfiles/openindiana.run @@ -72,6 +72,15 @@ tests = ['cachefile_001_pos', 'cachefile_002_pos', 'cachefile_003_pos', pre = post = +[/opt/zfs-tests/tests/functional/casenorm] +tests = ['case_all_values', 'norm_all_values', + 'sensitive_none_lookup', 'sensitive_none_delete', + 'sensitive_formd_lookup', 'sensitive_formd_delete', + 'insensitive_none_lookup', 'insensitive_none_delete', + 'insensitive_formd_lookup', 'insensitive_formd_delete', + 'mixed_none_lookup', 'mixed_none_lookup_ci', 'mixed_none_delete', + 'mixed_formd_lookup', 'mixed_formd_lookup_ci', 'mixed_formd_delete'] + [/opt/zfs-tests/tests/functional/checksum] tests = ['run_edonr_test', 'run_sha2_test', 'run_skein_test'] pre = diff --git a/usr/src/test/zfs-tests/tests/functional/Makefile b/usr/src/test/zfs-tests/tests/functional/Makefile index a182243e60..6f3638a7dd 100644 --- a/usr/src/test/zfs-tests/tests/functional/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/Makefile @@ -1,5 +1,4 @@ # -# # This file and its contents are supplied under the terms of the # Common Development and Distribution License ("CDDL"), version 1.0. # You may only use this file in accordance with the terms of version @@ -12,6 +11,7 @@ # # Copyright (c) 2013, 2015 by Delphix. All rights reserved. +# Copyright 2015 Nexenta Systems, Inc. All rights reserved. # .PARALLEL: $(SUBDIRS) @@ -21,6 +21,7 @@ SUBDIRS = acl \ bootfs \ cache \ cachefile \ + casenorm \ checksum \ clean_mirror \ cli_root \ @@ -75,5 +76,4 @@ SUBDIRS = acl \ xattr \ zvol - include $(SRC)/test/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/casenorm/Makefile b/usr/src/test/zfs-tests/tests/functional/casenorm/Makefile new file mode 100644 index 0000000000..de9a016bcb --- /dev/null +++ b/usr/src/test/zfs-tests/tests/functional/casenorm/Makefile @@ -0,0 +1,61 @@ +# +# This file and its contents are supplied under the terms of the +# Common Development and Distribution License ("CDDL"), version 1.0. +# You may only use this file in accordance with the terms of version +# 1.0 of the CDDL. +# +# A full copy of the text of the CDDL should have accompanied this +# source. A copy of the CDDL is also available via the Internet at +# http://www.illumos.org/license/CDDL. +# + +# +# Copyright 2015 Nexenta Systems, Inc. All rights reserved. +# + +include $(SRC)/Makefile.master + +ROOTOPTPKG= $(ROOT)/opt/zfs-tests +ROOTTESTDIR= $(ROOTOPTPKG)/tests/functional/casenorm + +TESTS= setup \ + cleanup \ + case_all_values \ + norm_all_values \ + sensitive_none_lookup \ + sensitive_none_delete \ + sensitive_formd_lookup \ + sensitive_formd_delete \ + insensitive_none_lookup \ + insensitive_none_delete \ + insensitive_formd_lookup \ + insensitive_formd_delete \ + mixed_none_lookup \ + mixed_none_lookup_ci \ + mixed_none_delete \ + mixed_formd_lookup \ + mixed_formd_lookup_ci \ + mixed_formd_delete + +FILES= casenorm.cfg \ + casenorm.kshlib + +ROOTTESTS= $(TESTS:%=$(ROOTTESTDIR)/%) +ROOTFILES= $(FILES:%=$(ROOTTESTDIR)/%) +$(ROOTTESTS) := FILEMODE = 0555 +$(ROOTFILES) := FILEMODE = 0444 + +all lint clean clobber: + +install: $(ROOTTESTS) $(ROOTFILES) + +$(ROOTTESTS) $(ROOTFILES): $(ROOTTESTDIR) + +$(ROOTTESTDIR): + $(INS.dir) + +$(ROOTTESTDIR)/%: %.ksh + $(INS.rename) + +$(ROOTTESTDIR)/%: % + $(INS.file) diff --git a/usr/src/test/zfs-tests/tests/functional/casenorm/case_all_values.ksh b/usr/src/test/zfs-tests/tests/functional/casenorm/case_all_values.ksh new file mode 100644 index 0000000000..ea5fffb926 --- /dev/null +++ b/usr/src/test/zfs-tests/tests/functional/casenorm/case_all_values.ksh @@ -0,0 +1,42 @@ +#! /usr/bin/ksh -p +# +# +# This file and its contents are supplied under the terms of the +# Common Development and Distribution License ("CDDL"), version 1.0. +# You may only use this file in accordance with the terms of version +# 1.0 of the CDDL. +# +# A full copy of the text of the CDDL should have accompanied this +# source. A copy of the CDDL is also available via the Internet at +# http://www.illumos.org/license/CDDL. +# + +# +# Copyright 2015 Nexenta Systems, Inc. All rights reserved. +# + +. $STF_SUITE/tests/functional/casenorm/casenorm.kshlib + +# DESCRIPTION: +# Check that we can create FS with any supported casesensitivity value. +# +# STRATEGY: +# For all suported casesensitivity values: +# 1. Create FS with given casesensitivity value. + +verify_runnable "global" + +function cleanup +{ + destroy_testfs +} + +log_onexit cleanup +log_assert "Can create FS with any supported casesensitivity value" + +for caseval in sensitive insensitive mixed; do + create_testfs "-o casesensitivity=$caseval" + destroy_testfs +done + +log_pass "Can create FS with any supported casesensitivity value" diff --git a/usr/src/test/zfs-tests/tests/functional/casenorm/casenorm.cfg b/usr/src/test/zfs-tests/tests/functional/casenorm/casenorm.cfg new file mode 100644 index 0000000000..ffad2fb9f9 --- /dev/null +++ b/usr/src/test/zfs-tests/tests/functional/casenorm/casenorm.cfg @@ -0,0 +1,27 @@ +# +# This file and its contents are supplied under the terms of the +# Common Development and Distribution License ("CDDL"), version 1.0. +# You may only use this file in accordance with the terms of version +# 1.0 of the CDDL. +# +# A full copy of the text of the CDDL should have accompanied this +# source. A copy of the CDDL is also available via the Internet at +# http://www.illumos.org/license/CDDL. +# + +# +# Copyright 2015 Nexenta Systems, Inc. All rights reserved. +# + +NAME_C_ORIG=$($ECHO 'F\0303\0257L\0303\0253N\0303\0204m\0303\0253') +NAME_C_UPPER=$($ECHO 'F\0303\0217L\0303\0213N\0303\0204M\0303\0213') +NAME_C_LOWER=$($ECHO 'f\0303\0257l\0303\0253n\0303\0244m\0303\0253') +NAME_D_ORIG=$($ECHO 'Fi\0314\0210Le\0314\0210NA\0314\0210me\0314\0210') +NAME_D_UPPER=$($ECHO 'FI\0314\0210LE\0314\0210NA\0314\0210ME\0314\0210') +NAME_D_LOWER=$($ECHO 'fi\0314\0210le\0314\0210na\0314\0210me\0314\0210') +NAMES_ORIG="$NAME_C_ORIG $NAME_D_ORIG" +NAMES_UPPER="$NAME_C_UPPER $NAME_D_UPPER" +NAMES_LOWER="$NAME_C_LOWER $NAME_D_LOWER" +NAMES_C="$NAME_C_ORIG $NAME_C_UPPER $NAME_C_LOWER" +NAMES_D="$NAME_D_ORIG $NAME_D_UPPER $NAME_D_LOWER" +NAMES_ALL="$NAMES_C $NAMES_D" diff --git a/usr/src/test/zfs-tests/tests/functional/casenorm/casenorm.kshlib b/usr/src/test/zfs-tests/tests/functional/casenorm/casenorm.kshlib new file mode 100644 index 0000000000..ff1206fdb6 --- /dev/null +++ b/usr/src/test/zfs-tests/tests/functional/casenorm/casenorm.kshlib @@ -0,0 +1,119 @@ +# +# This file and its contents are supplied under the terms of the +# Common Development and Distribution License ("CDDL"), version 1.0. +# You may only use this file in accordance with the terms of version +# 1.0 of the CDDL. +# +# A full copy of the text of the CDDL should have accompanied this +# source. A copy of the CDDL is also available via the Internet at +# http://www.illumos.org/license/CDDL. +# + +# +# Copyright 2015 Nexenta Systems, Inc. All rights reserved. +# + +. $STF_SUITE/include/libtest.shlib +. $STF_SUITE/tests/functional/casenorm/casenorm.cfg + +function create_testfs +{ + typeset opts=$1 + + $RM -rf $TESTDIR || log_unresolved Could not remove $TESTDIR + $MKDIR -p $TESTDIR || log_unresolved Could not create $TESTDIR + + log_must $ZFS create $opts $TESTPOOL/$TESTFS + log_must $ZFS set mountpoint=$TESTDIR $TESTPOOL/$TESTFS +} + +function destroy_testfs +{ + if datasetexists $TESTPOOL/$TESTFS ; then + log_must $ZFS destroy -f $TESTPOOL/$TESTFS + $RM -rf $TESTDIR || log_unresolved Could not remove $TESTDIR + fi +} + +function create_file +{ + typeset name=$TESTDIR/$1 + + $ECHO $name > $name +} + +function delete_file +{ + typeset name=$TESTDIR/$1 + + $RM $name >/dev/null 2>&1 + + if [[ $? -ne 0 ]] ; then + return 1 + fi + + if [[ -f $name ]] ; then + return 2 + fi +} + +function lookup_file +{ + typeset name=$1 + + $ZLOOK -l $TESTDIR $name >/dev/null 2>&1 +} + +function lookup_file_ci +{ + typeset name=$1 + + $ZLOOK -il $TESTDIR $name >/dev/null 2>&1 +} + +function lookup_any +{ + for name in $NAMES_ALL ; do + lookup_file $name + if [[ $? -eq 0 ]] ; then + return 0 + fi + done + + return 1 +} + +function switch_norm +{ + typeset norm=$(get_norm $1) + + if [[ $norm == "C" ]] ; then + print "D" + else + print "C" + fi +} + +function get_norm +{ + if [[ "${NAMES_C#*$1}" != "${NAMES_C}" ]] ; then + print "C" + elif [[ "${NAMES_D#*$1}" != "${NAMES_D}" ]] ; then + print "D" + else + return 1 + fi +} + +function get_case +{ + if [[ ${NAMES_UPPER#*$1} != ${NAMES_UPPER} ]] ; then + print "UPPER" + elif [[ ${NAMES_LOWER#*$1} != ${NAMES_LOWER} ]] ; then + print "LOWER" + elif [[ ${NAMES_ORIG#*$1} != ${NAMES_ORIG} ]] ; then + print "ORIG" + else + return 1 + fi +} diff --git a/usr/src/test/zfs-tests/tests/functional/casenorm/cleanup.ksh b/usr/src/test/zfs-tests/tests/functional/casenorm/cleanup.ksh new file mode 100644 index 0000000000..0afd18ea5b --- /dev/null +++ b/usr/src/test/zfs-tests/tests/functional/casenorm/cleanup.ksh @@ -0,0 +1,20 @@ +#! /usr/bin/ksh -p +# +# +# This file and its contents are supplied under the terms of the +# Common Development and Distribution License ("CDDL"), version 1.0. +# You may only use this file in accordance with the terms of version +# 1.0 of the CDDL. +# +# A full copy of the text of the CDDL should have accompanied this +# source. A copy of the CDDL is also available via the Internet at +# http://www.illumos.org/license/CDDL. +# + +# +# Copyright 2015 Nexenta Systems, Inc. All rights reserved. +# + +. $STF_SUITE/include/libtest.shlib + +default_cleanup diff --git a/usr/src/test/zfs-tests/tests/functional/casenorm/insensitive_formd_delete.ksh b/usr/src/test/zfs-tests/tests/functional/casenorm/insensitive_formd_delete.ksh new file mode 100644 index 0000000000..98a03dffb5 --- /dev/null +++ b/usr/src/test/zfs-tests/tests/functional/casenorm/insensitive_formd_delete.ksh @@ -0,0 +1,53 @@ +#! /usr/bin/ksh -p +# +# +# This file and its contents are supplied under the terms of the +# Common Development and Distribution License ("CDDL"), version 1.0. +# You may only use this file in accordance with the terms of version +# 1.0 of the CDDL. +# +# A full copy of the text of the CDDL should have accompanied this +# source. A copy of the CDDL is also available via the Internet at +# http://www.illumos.org/license/CDDL. +# + +# +# Copyright 2015 Nexenta Systems, Inc. All rights reserved. +# + +. $STF_SUITE/tests/functional/casenorm/casenorm.kshlib + +# DESCRIPTION: +# For the filesystem with casesensitivity=insensitive, normalization=formD, +# check that file can be deleted using any name form. +# +# STRATEGY: +# For each c/n name form: +# 1. Create file with given c/n name form. +# 2. Check that deleting file using other c/n name forms succeeds. +# 3. Check that file isn't accessible by any c/n name form. + +verify_runnable "global" + +function cleanup +{ + destroy_testfs +} + +log_onexit cleanup +log_assert "CI-UN FS: delete succeeds using any name form" + +# Can delete using any case/normalization form +create_testfs "-o casesensitivity=insensitive -o normalization=formD" + +for name1 in $NAMES_ALL ; do + for name2 in $NAMES_ALL ; do + log_must create_file $name1 + log_must delete_file $name2 + log_mustnot lookup_any + done +done + +destroy_testfs + +log_pass "CI-UN FS: delete succeeds using any name form" diff --git a/usr/src/test/zfs-tests/tests/functional/casenorm/insensitive_formd_lookup.ksh b/usr/src/test/zfs-tests/tests/functional/casenorm/insensitive_formd_lookup.ksh new file mode 100644 index 0000000000..11824b7af6 --- /dev/null +++ b/usr/src/test/zfs-tests/tests/functional/casenorm/insensitive_formd_lookup.ksh @@ -0,0 +1,51 @@ +#! /usr/bin/ksh -p +# +# +# This file and its contents are supplied under the terms of the +# Common Development and Distribution License ("CDDL"), version 1.0. +# You may only use this file in accordance with the terms of version +# 1.0 of the CDDL. +# +# A full copy of the text of the CDDL should have accompanied this +# source. A copy of the CDDL is also available via the Internet at +# http://www.illumos.org/license/CDDL. +# + +# +# Copyright 2015 Nexenta Systems, Inc. All rights reserved. +# + +. $STF_SUITE/tests/functional/casenorm/casenorm.kshlib + +# DESCRIPTION: +# For the filesystem with casesensitivity=insensitive, normalization=formD, +# check that lookup succeds using any name form. +# +# STRATEGY: +# For each c/n name form: +# 1. Create file with given c/n name form. +# 2. Check that lookup succeeds for any other c/n name form. + +verify_runnable "global" + +function cleanup +{ + destroy_testfs +} + +log_onexit cleanup +log_assert "CI-UN FS: lookup succeeds using any name form" + +create_testfs "-o casesensitivity=insensitive -o normalization=formD" + +for name1 in $NAMES_ALL ; do + log_must create_file $name1 + for name2 in $NAMES_ALL ; do + log_must lookup_file $name2 + done + delete_file $name1 +done + +destroy_testfs + +log_pass "CI-UN FS: lookup succeeds using any name form" diff --git a/usr/src/test/zfs-tests/tests/functional/casenorm/insensitive_none_delete.ksh b/usr/src/test/zfs-tests/tests/functional/casenorm/insensitive_none_delete.ksh new file mode 100644 index 0000000000..e06dd2e579 --- /dev/null +++ b/usr/src/test/zfs-tests/tests/functional/casenorm/insensitive_none_delete.ksh @@ -0,0 +1,71 @@ +#! /usr/bin/ksh -p +# +# +# This file and its contents are supplied under the terms of the +# Common Development and Distribution License ("CDDL"), version 1.0. +# You may only use this file in accordance with the terms of version +# 1.0 of the CDDL. +# +# A full copy of the text of the CDDL should have accompanied this +# source. A copy of the CDDL is also available via the Internet at +# http://www.illumos.org/license/CDDL. +# + +# +# Copyright 2015 Nexenta Systems, Inc. All rights reserved. +# + +. $STF_SUITE/tests/functional/casenorm/casenorm.kshlib + +# DESCRIPTION: +# For the filesystem with casesensitivity=insensitive, normalization=none, +# check that delete succeeds if (norm=same). +# +# STRATEGY: +# For each c/n name form: +# 1. Create file with given c/n name form. +# 2. Check that delete succeeds if (norm=same). +# 3. Check that file is no longer accessible using any name form. +# 4. Check that delete fails if (norm=other). + +verify_runnable "global" + +function cleanup +{ + destroy_testfs +} + +log_onexit cleanup +log_assert "CI-not-UN FS: delete succeeds if (norm=same)" + +create_testfs "-o casesensitivity=insensitive -o normalization=none" + +for name1 in $NAMES_C ; do + for name2 in $NAMES_C ; do + log_must create_file $name1 + log_must delete_file $name2 + log_mustnot lookup_any + done + for name2 in $NAMES_D ; do + log_must create_file $name1 + log_mustnot delete_file $name2 + delete_file $name1 + done +done + +for name1 in $NAMES_D ; do + for name2 in $NAMES_D ; do + log_must create_file $name1 + log_must delete_file $name2 + log_mustnot lookup_any + done + for name2 in $NAMES_C ; do + log_must create_file $name1 + log_mustnot delete_file $name2 + delete_file $name1 + done +done + +destroy_testfs + +log_pass "CI-not-UN FS: delete succeeds if (norm=same)" diff --git a/usr/src/test/zfs-tests/tests/functional/casenorm/insensitive_none_lookup.ksh b/usr/src/test/zfs-tests/tests/functional/casenorm/insensitive_none_lookup.ksh new file mode 100644 index 0000000000..9d52d52b14 --- /dev/null +++ b/usr/src/test/zfs-tests/tests/functional/casenorm/insensitive_none_lookup.ksh @@ -0,0 +1,66 @@ +#! /usr/bin/ksh -p +# +# +# This file and its contents are supplied under the terms of the +# Common Development and Distribution License ("CDDL"), version 1.0. +# You may only use this file in accordance with the terms of version +# 1.0 of the CDDL. +# +# A full copy of the text of the CDDL should have accompanied this +# source. A copy of the CDDL is also available via the Internet at +# http://www.illumos.org/license/CDDL. +# + +# +# Copyright 2015 Nexenta Systems, Inc. All rights reserved. +# + +. $STF_SUITE/tests/functional/casenorm/casenorm.kshlib + +# DESCRIPTION: +# For the filesystem with casesensitivity=insensitive, normalization=none, +# check that lookup succeeds only if (norm=same) +# +# STRATEGY: +# For each c/n name form: +# 1. Create file with given c/n name form. +# 2. Check that lookup succeeds if (norm=same). +# 3. Check that lookup fails if (norm=other). + +verify_runnable "global" + +function cleanup +{ + destroy_testfs +} + +log_onexit cleanup +log_assert "CI-not-UN FS: lookup succeeds only if (norm=same)" + +create_testfs "-o casesensitivity=insensitive -o normalization=none" + +for name1 in $NAMES_C ; do + log_must create_file $name1 + for name2 in $NAMES_C ; do + log_must lookup_file $name2 + done + for name2 in $NAMES_D; do + log_mustnot lookup_file $name2 + done + delete_file $name1 +done + +for name1 in $NAMES_D ; do + log_must create_file $name1 + for name2 in $NAMES_D ; do + log_must lookup_file $name2 + done + for name2 in $NAMES_C; do + log_mustnot lookup_file $name2 + done + delete_file $name1 +done + +destroy_testfs + +log_pass "CI-not-UN FS: lookup succeeds only if (norm=same)" diff --git a/usr/src/test/zfs-tests/tests/functional/casenorm/mixed_formd_delete.ksh b/usr/src/test/zfs-tests/tests/functional/casenorm/mixed_formd_delete.ksh new file mode 100644 index 0000000000..3e7400c6b3 --- /dev/null +++ b/usr/src/test/zfs-tests/tests/functional/casenorm/mixed_formd_delete.ksh @@ -0,0 +1,59 @@ +#! /usr/bin/ksh -p +# +# +# This file and its contents are supplied under the terms of the +# Common Development and Distribution License ("CDDL"), version 1.0. +# You may only use this file in accordance with the terms of version +# 1.0 of the CDDL. +# +# A full copy of the text of the CDDL should have accompanied this +# source. A copy of the CDDL is also available via the Internet at +# http://www.illumos.org/license/CDDL. +# + +# +# Copyright 2015 Nexenta Systems, Inc. All rights reserved. +# + +. $STF_SUITE/tests/functional/casenorm/casenorm.kshlib + +# DESCRIPTION: +# For the filesystem with casesensitivity=mixed, normalization=formD, +# check that delete succeeds if (case=same). +# +# STRATEGY: +# For each c/n name form: +# 1. Create file with given c/n name form. +# 2. Check that delete succeeds if (case=same). +# 3. Check that file is no longer accessible using any name form. +# 4. Check that delete fails for all other name forms other than original. + +verify_runnable "global" + +function cleanup +{ + destroy_testfs +} + +log_onexit cleanup +log_assert "CM-UN FS: delete succeeds if (case=same)" + +create_testfs "-o casesensitivity=mixed -o normalization=formD" + +for name1 in $NAMES_ALL; do + typeset -n namen=NAME_$(switch_norm $name1)_$(get_case $name1) + for name2 in $NAMES_ALL; do + log_must create_file $name1 + if [[ $name2 == $namen || $name2 == $name1 ]]; then + log_must delete_file $name2 + log_mustnot lookup_any + else + log_mustnot delete_file $name2 + fi + delete_file $name1 + done +done + +destroy_testfs + +log_pass "CM-UN FS: delete succeeds if (case=same)" diff --git a/usr/src/test/zfs-tests/tests/functional/casenorm/mixed_formd_lookup.ksh b/usr/src/test/zfs-tests/tests/functional/casenorm/mixed_formd_lookup.ksh new file mode 100644 index 0000000000..5250d1bb0f --- /dev/null +++ b/usr/src/test/zfs-tests/tests/functional/casenorm/mixed_formd_lookup.ksh @@ -0,0 +1,56 @@ +#! /usr/bin/ksh -p +# +# +# This file and its contents are supplied under the terms of the +# Common Development and Distribution License ("CDDL"), version 1.0. +# You may only use this file in accordance with the terms of version +# 1.0 of the CDDL. +# +# A full copy of the text of the CDDL should have accompanied this +# source. A copy of the CDDL is also available via the Internet at +# http://www.illumos.org/license/CDDL. +# + +# +# Copyright 2015 Nexenta Systems, Inc. All rights reserved. +# + +. $STF_SUITE/tests/functional/casenorm/casenorm.kshlib + +# DESCRIPTION: +# For the filesystem with casesensitivity=mixed, normalization=formD, +# check that lookup succeeds only if (case=same). +# +# STRATEGY: +# For each c/n name form: +# 1. Create file with given c/n name form. +# 2. Check that lookup succeeds if (case=same). +# 3. Check that lookup fails if (case=other). + +verify_runnable "global" + +function cleanup +{ + destroy_testfs +} + +log_onexit cleanup +log_assert "CM-UN FS: lookup succeeds if (case=same)" + +create_testfs "-o casesensitivity=mixed -o normalization=formD" + +for name1 in $NAMES_ALL; do + log_must create_file $name1 + for name2 in $NAMES_ALL; do + if [[ $(get_case $name2) == $(get_case $name1) ]]; then + log_must lookup_file $name2 + else + log_mustnot lookup_file $name2 + fi + done + delete_file $name1 +done + +destroy_testfs + +log_pass "CM-UN FS: lookup succeeds if (case=same)" diff --git a/usr/src/test/zfs-tests/tests/functional/casenorm/mixed_formd_lookup_ci.ksh b/usr/src/test/zfs-tests/tests/functional/casenorm/mixed_formd_lookup_ci.ksh new file mode 100644 index 0000000000..584873bde0 --- /dev/null +++ b/usr/src/test/zfs-tests/tests/functional/casenorm/mixed_formd_lookup_ci.ksh @@ -0,0 +1,51 @@ +#! /usr/bin/ksh -p +# +# +# This file and its contents are supplied under the terms of the +# Common Development and Distribution License ("CDDL"), version 1.0. +# You may only use this file in accordance with the terms of version +# 1.0 of the CDDL. +# +# A full copy of the text of the CDDL should have accompanied this +# source. A copy of the CDDL is also available via the Internet at +# http://www.illumos.org/license/CDDL. +# + +# +# Copyright 2015 Nexenta Systems, Inc. All rights reserved. +# + +. $STF_SUITE/tests/functional/casenorm/casenorm.kshlib + +# DESCRIPTION: +# For the filesystem with casesensitivity=insensitive, normalization=formD, +# check that CI lookup succeeds using any name form. +# +# STRATEGY: +# For each c/n name form: +# 1. Create file with given c/n name form. +# 2. Check that CI lookup succeeds for any c/n name form. + +verify_runnable "global" + +function cleanup +{ + destroy_testfs +} + +log_onexit cleanup +log_assert "CM-UN FS: CI lookup succeeds using any name form" + +create_testfs "-o casesensitivity=mixed -o normalization=formD" + +for name1 in $NAMES_ALL ; do + log_must create_file $name1 + for name2 in $NAMES_ALL ; do + log_must lookup_file_ci $name2 + done + delete_file $name1 +done + +destroy_testfs + +log_pass "CM-UN FS: CI lookup succeeds using any name form" diff --git a/usr/src/test/zfs-tests/tests/functional/casenorm/mixed_none_delete.ksh b/usr/src/test/zfs-tests/tests/functional/casenorm/mixed_none_delete.ksh new file mode 100644 index 0000000000..490f88689d --- /dev/null +++ b/usr/src/test/zfs-tests/tests/functional/casenorm/mixed_none_delete.ksh @@ -0,0 +1,56 @@ +#! /usr/bin/ksh -p +# +# +# This file and its contents are supplied under the terms of the +# Common Development and Distribution License ("CDDL"), version 1.0. +# You may only use this file in accordance with the terms of version +# 1.0 of the CDDL. +# +# A full copy of the text of the CDDL should have accompanied this +# source. A copy of the CDDL is also available via the Internet at +# http://www.illumos.org/license/CDDL. +# + +# +# Copyright 2015 Nexenta Systems, Inc. All rights reserved. +# + +. $STF_SUITE/tests/functional/casenorm/casenorm.kshlib + +# DESCRIPTION: +# For the filesystem with casesensitivity=mixed, normalization=none, +# check that delete succeeds only if (case=same and norm=same). +# +# STRATEGY: +# For each c/n name form: +# 1. Create file in given c/n name form. +# 2. Check that delete fails for all other name forms. +# 3. Check that delete succeeds if (case=same and norm=same). +# 4. Check that file is no longer accessible by any name form. + +verify_runnable "global" + +function cleanup +{ + destroy_testfs +} + +log_onexit cleanup +log_assert "CM-not-UN FS: delete succeeds only if using exact name form" + +create_testfs "-o casesensitivity=mixed -o normalization=none" + +for name1 in $NAMES_ALL ; do + log_must create_file $name1 + for name2 in $NAMES_ALL ; do + if [[ $name2 != $name1 ]] ; then + log_mustnot delete_file $name2 + fi + done + delete_file $name1 + log_mustnot lookup_any +done + +destroy_testfs + +log_pass "CM-not-UN FS: delete succeeds only if using exact name form" diff --git a/usr/src/test/zfs-tests/tests/functional/casenorm/mixed_none_lookup.ksh b/usr/src/test/zfs-tests/tests/functional/casenorm/mixed_none_lookup.ksh new file mode 100644 index 0000000000..ad938a6d17 --- /dev/null +++ b/usr/src/test/zfs-tests/tests/functional/casenorm/mixed_none_lookup.ksh @@ -0,0 +1,53 @@ +#! /usr/bin/ksh -p +# +# +# This file and its contents are supplied under the terms of the +# Common Development and Distribution License ("CDDL"), version 1.0. +# You may only use this file in accordance with the terms of version +# 1.0 of the CDDL. +# +# A full copy of the text of the CDDL should have accompanied this +# source. A copy of the CDDL is also available via the Internet at +# http://www.illumos.org/license/CDDL. +# + +# +# Copyright 2015 Nexenta Systems, Inc. All rights reserved. +# + +. $STF_SUITE/tests/functional/casenorm/casenorm.kshlib + +# DESCRIPTION: +# For the filesystem with casesensitivity=mixed, normalization=none, +# check that lookup succeeds only if (case=same and norm=same). +# +# STRATEGY: +# For each c/n name form: +# 1. Create file with given c/n name form. +# 2. Check that lookup fails for all other c/n name forms. + +verify_runnable "global" + +function cleanup +{ + destroy_testfs +} + +log_onexit cleanup +log_assert "CM-not-UN FS: lookup succeeds only if using exact name form" + +create_testfs "-o casesensitivity=mixed -o normalization=none" + +for name1 in $NAMES_ALL; do + for name2 in $NAMES_ALL; do + log_must create_file $name1 + if [[ $name2 != $name1 ]]; then + log_mustnot lookup_file $name2 + fi + delete_file $name1 + done +done + +destroy_testfs + +log_pass "CM-not-UN FS: lookup succeeds only if using exact name form" diff --git a/usr/src/test/zfs-tests/tests/functional/casenorm/mixed_none_lookup_ci.ksh b/usr/src/test/zfs-tests/tests/functional/casenorm/mixed_none_lookup_ci.ksh new file mode 100644 index 0000000000..3fd48a7aa6 --- /dev/null +++ b/usr/src/test/zfs-tests/tests/functional/casenorm/mixed_none_lookup_ci.ksh @@ -0,0 +1,66 @@ +#! /usr/bin/ksh -p +# +# +# This file and its contents are supplied under the terms of the +# Common Development and Distribution License ("CDDL"), version 1.0. +# You may only use this file in accordance with the terms of version +# 1.0 of the CDDL. +# +# A full copy of the text of the CDDL should have accompanied this +# source. A copy of the CDDL is also available via the Internet at +# http://www.illumos.org/license/CDDL. +# + +# +# Copyright 2015 Nexenta Systems, Inc. All rights reserved. +# + +. $STF_SUITE/tests/functional/casenorm/casenorm.kshlib + +# DESCRIPTION: +# For the filesystem with casesensitivity=mixed, normalization=none, +# check that CI lookup succeeds only if (norm=same). +# +# STRATEGY: +# For each c/n name form: +# 1. Create file with given c/n name form. +# 2. Check that CI lookup succeeds if (norm=same). +# 3. Check that CI lookup fails if (norm=other). + +verify_runnable "global" + +function cleanup +{ + destroy_testfs +} + +log_onexit cleanup +log_assert "CM-not-UN FS: CI lookup succeeds only if (norm=same)" + +create_testfs "-o casesensitivity=mixed -o normalization=none" + +for name1 in $NAMES_C ; do + log_must create_file $name1 + for name2 in $NAMES_C ; do + log_must lookup_file_ci $name2 + done + for name2 in $NAMES_D; do + log_mustnot lookup_file_ci $name2 + done + delete_file $name1 +done + +for name1 in $NAMES_D ; do + log_must create_file $name1 + for name2 in $NAMES_D ; do + log_must lookup_file_ci $name2 + done + for name2 in $NAMES_C; do + log_mustnot lookup_file_ci $name2 + done + delete_file $name1 +done + +destroy_testfs + +log_pass "CM-not-UN FS: CI lookup succeeds only if (norm=same)" diff --git a/usr/src/test/zfs-tests/tests/functional/casenorm/norm_all_values.ksh b/usr/src/test/zfs-tests/tests/functional/casenorm/norm_all_values.ksh new file mode 100644 index 0000000000..c5af81c0b7 --- /dev/null +++ b/usr/src/test/zfs-tests/tests/functional/casenorm/norm_all_values.ksh @@ -0,0 +1,57 @@ +#! /usr/bin/ksh -p +# +# +# This file and its contents are supplied under the terms of the +# Common Development and Distribution License ("CDDL"), version 1.0. +# You may only use this file in accordance with the terms of version +# 1.0 of the CDDL. +# +# A full copy of the text of the CDDL should have accompanied this +# source. A copy of the CDDL is also available via the Internet at +# http://www.illumos.org/license/CDDL. +# + +# +# Copyright 2015 Nexenta Systems, Inc. All rights reserved. +# + +. $STF_SUITE/tests/functional/casenorm/casenorm.kshlib + +# DESCRIPTION: +# Check that we can create FS with all supported normalization forms. +# +# STRATEGY: +# 1. Create FS with all supported normalization forms. +# 2. Check that utf8only is set on except for normalization=none. +# 3. Check that it's not possible to create FS with utf8only=off +# and normalization other than none. + +verify_runnable "global" + +function cleanup +{ + destroy_testfs +} + +log_onexit cleanup +log_assert "Can create FS with all supported normalization forms" + +for form in none formC formD formKC formKD; do + create_testfs "-o normalization=$form" + if [[ $form != "none" ]] ; then + utf8only=$($ZFS get -H -o value utf8only $TESTPOOL/$TESTFS) + if [[ $utf8only != "on" ]]; then + log_fail "Turning on normalization didn't set " \ + "utf8only to on" + fi + fi + destroy_testfs +done + +for form in formC formD formKC formKD; do + log_mustnot $ZFS create -o utf8only=off -o normalization=$form \ + $TESTPOOL/$TESTFS + destroy_testfs +done + +log_pass "Can create FS with all supported normalization forms" diff --git a/usr/src/test/zfs-tests/tests/functional/casenorm/sensitive_formd_delete.ksh b/usr/src/test/zfs-tests/tests/functional/casenorm/sensitive_formd_delete.ksh new file mode 100644 index 0000000000..f02904d124 --- /dev/null +++ b/usr/src/test/zfs-tests/tests/functional/casenorm/sensitive_formd_delete.ksh @@ -0,0 +1,59 @@ +#! /usr/bin/ksh -p +# +# +# This file and its contents are supplied under the terms of the +# Common Development and Distribution License ("CDDL"), version 1.0. +# You may only use this file in accordance with the terms of version +# 1.0 of the CDDL. +# +# A full copy of the text of the CDDL should have accompanied this +# source. A copy of the CDDL is also available via the Internet at +# http://www.illumos.org/license/CDDL. +# + +# +# Copyright 2015 Nexenta Systems, Inc. All rights reserved. +# + +. $STF_SUITE/tests/functional/casenorm/casenorm.kshlib + +# DESCRIPTION: +# For the filesystem with casesensitivity=sensitive, normalization=formD, +# check that delete succeeds if (case=same). +# +# STRATEGY: +# For each c/n name form: +# 1. Create file with given c/n name form. +# 2. Check that delete succeeds if (case=same). +# 3. Check that file is no longer accessible using any name form. +# 4. Check that delete fails for all other name forms. + +verify_runnable "global" + +function cleanup +{ + destroy_testfs +} + +log_onexit cleanup +log_assert "CS-UN FS: delete succeeds if (case=same)" + +create_testfs "-o casesensitivity=sensitive -o normalization=formD" + +for name1 in $NAMES_ALL ; do + typeset -n namen=NAME_$(switch_norm $name1)_$(get_case $name1) + for name2 in $NAMES_ALL ; do + log_must create_file $name1 + if [[ $name2 == $namen || $name2 == $name1 ]] ; then + log_must delete_file $name2 + log_mustnot lookup_any + else + log_mustnot delete_file $name2 + fi + delete_file $name1 + done +done + +destroy_testfs + +log_pass "CS-UN FS: delete succeeds if (case=same)" diff --git a/usr/src/test/zfs-tests/tests/functional/casenorm/sensitive_formd_lookup.ksh b/usr/src/test/zfs-tests/tests/functional/casenorm/sensitive_formd_lookup.ksh new file mode 100644 index 0000000000..92c3ed38d7 --- /dev/null +++ b/usr/src/test/zfs-tests/tests/functional/casenorm/sensitive_formd_lookup.ksh @@ -0,0 +1,56 @@ +#! /usr/bin/ksh -p +# +# +# This file and its contents are supplied under the terms of the +# Common Development and Distribution License ("CDDL"), version 1.0. +# You may only use this file in accordance with the terms of version +# 1.0 of the CDDL. +# +# A full copy of the text of the CDDL should have accompanied this +# source. A copy of the CDDL is also available via the Internet at +# http://www.illumos.org/license/CDDL. +# + +# +# Copyright 2015 Nexenta Systems, Inc. All rights reserved. +# + +. $STF_SUITE/tests/functional/casenorm/casenorm.kshlib + +# DESCRIPTION: +# For the filesystem with casesensitivity=sensitive, normalization=formD, +# check that lookup only if (case=same). +# +# STRATEGY: +# For each c/n name form: +# 1. Create file with given c/n name form. +# 2. Check that lookup succeeds if (case=same). +# 3. Check that lookup fails if (case=other). + +verify_runnable "global" + +function cleanup +{ + destroy_testfs +} + +log_onexit cleanup +log_assert "CS-UN FS: lookup succeeds if (case=same)" + +create_testfs "-o casesensitivity=sensitive -o normalization=formD" + +for name1 in $NAMES_ALL; do + log_must create_file $name1 + for name2 in $NAMES_ALL; do + if [[ $(get_case $name2) == $(get_case $name1) ]]; then + log_must lookup_file $name2 + else + log_mustnot lookup_file $name2 + fi + done + delete_file $name1 +done + +destroy_testfs + +log_pass "CS-UN FS: lookup succeeds if (case=same)" diff --git a/usr/src/test/zfs-tests/tests/functional/casenorm/sensitive_none_delete.ksh b/usr/src/test/zfs-tests/tests/functional/casenorm/sensitive_none_delete.ksh new file mode 100644 index 0000000000..a6a145e100 --- /dev/null +++ b/usr/src/test/zfs-tests/tests/functional/casenorm/sensitive_none_delete.ksh @@ -0,0 +1,56 @@ +#! /usr/bin/ksh -p +# +# +# This file and its contents are supplied under the terms of the +# Common Development and Distribution License ("CDDL"), version 1.0. +# You may only use this file in accordance with the terms of version +# 1.0 of the CDDL. +# +# A full copy of the text of the CDDL should have accompanied this +# source. A copy of the CDDL is also available via the Internet at +# http://www.illumos.org/license/CDDL. +# + +# +# Copyright 2015 Nexenta Systems, Inc. All rights reserved. +# + +. $STF_SUITE/tests/functional/casenorm/casenorm.kshlib + +# DESCRIPTION: +# For the filesystem with casesensitivity=sensitive, normalization=none, +# check that delete succeeds only if (case=same and norm=same). +# +# STRATEGY: +# For each c/n name form: +# 1. Create file in given c/n name form. +# 2. Check that delete fails for all other name forms. +# 3. Check that delete succeeds if (case=same and norm=same). +# 4. Check that file is no longer accessible by any name form. + +verify_runnable "global" + +function cleanup +{ + destroy_testfs +} + +log_onexit cleanup +log_assert "CS-not-UN FS: delete succeeds only if using exact name form" + +create_testfs "-o casesensitivity=sensitive -o normalization=none" + +for name1 in $NAMES_ALL ; do + log_must create_file $name1 + for name2 in $NAMES_ALL ; do + if [[ $name2 != $name1 ]] ; then + log_mustnot delete_file $name2 + fi + done + delete_file $name1 + log_mustnot lookup_any +done + +destroy_testfs + +log_pass "CS-not-UN FS: delete succeeds only if using exact name form" diff --git a/usr/src/test/zfs-tests/tests/functional/casenorm/sensitive_none_lookup.ksh b/usr/src/test/zfs-tests/tests/functional/casenorm/sensitive_none_lookup.ksh new file mode 100644 index 0000000000..3cd341672b --- /dev/null +++ b/usr/src/test/zfs-tests/tests/functional/casenorm/sensitive_none_lookup.ksh @@ -0,0 +1,53 @@ +#! /usr/bin/ksh -p +# +# +# This file and its contents are supplied under the terms of the +# Common Development and Distribution License ("CDDL"), version 1.0. +# You may only use this file in accordance with the terms of version +# 1.0 of the CDDL. +# +# A full copy of the text of the CDDL should have accompanied this +# source. A copy of the CDDL is also available via the Internet at +# http://www.illumos.org/license/CDDL. +# + +# +# Copyright 2015 Nexenta Systems, Inc. All rights reserved. +# + +. $STF_SUITE/tests/functional/casenorm/casenorm.kshlib + +# DESCRIPTION: +# For the filesystem with casesensitivity=sensitive, normalization=none, +# check that lookup succeeds only if (case=same and norm=same). +# +# STRATEGY: +# For each c/n name form: +# 1. Create file with given c/n name form. +# 2. Check that lookup fails for all other c/n name forms. + +verify_runnable "global" + +function cleanup +{ + destroy_testfs +} + +log_onexit cleanup +log_assert "CS-not-UN FS: lookup succeeds only if using exact name form" + +create_testfs "-o casesensitivity=sensitive -o normalization=none" + +for name1 in $NAMES_ALL; do + for name2 in $NAMES_ALL; do + log_must create_file $name1 + if [[ $name2 != $name1 ]]; then + log_mustnot lookup_file $name2 + fi + delete_file $name1 + done +done + +destroy_testfs + +log_pass "CS-not-UN FS: lookup succeeds only if using exact name form" diff --git a/usr/src/test/zfs-tests/tests/functional/casenorm/setup.ksh b/usr/src/test/zfs-tests/tests/functional/casenorm/setup.ksh new file mode 100644 index 0000000000..b57431c8a5 --- /dev/null +++ b/usr/src/test/zfs-tests/tests/functional/casenorm/setup.ksh @@ -0,0 +1,23 @@ +#!/usr/bin/ksh -p +# +# +# This file and its contents are supplied under the terms of the +# Common Development and Distribution License ("CDDL"), version 1.0. +# You may only use this file in accordance with the terms of version +# 1.0 of the CDDL. +# +# A full copy of the text of the CDDL should have accompanied this +# source. A copy of the CDDL is also available via the Internet at +# http://www.illumos.org/license/CDDL. +# + +# +# Copyright 2015 Nexenta Systems, Inc. All rights reserved. +# + +. $STF_SUITE/include/libtest.shlib + +verify_runnable "global" +DISK=${DISKS%% *} +log_must $ZPOOL create $TESTPOOL $DISK +log_pass diff --git a/usr/src/uts/common/fs/zfs/bpobj.c b/usr/src/uts/common/fs/zfs/bpobj.c index 7a747b389a..c706a3850b 100644 --- a/usr/src/uts/common/fs/zfs/bpobj.c +++ b/usr/src/uts/common/fs/zfs/bpobj.c @@ -21,6 +21,7 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2011, 2014 by Delphix. All rights reserved. + * Copyright (c) 2014 Integros [integros.com] */ #include <sys/bpobj.h> diff --git a/usr/src/uts/common/fs/zfs/bptree.c b/usr/src/uts/common/fs/zfs/bptree.c index b2b9887742..a69fcc3760 100644 --- a/usr/src/uts/common/fs/zfs/bptree.c +++ b/usr/src/uts/common/fs/zfs/bptree.c @@ -21,6 +21,7 @@ /* * Copyright (c) 2011, 2014 by Delphix. All rights reserved. + * Copyright (c) 2014 Integros [integros.com] */ #include <sys/arc.h> diff --git a/usr/src/uts/common/fs/zfs/dbuf.c b/usr/src/uts/common/fs/zfs/dbuf.c index a4c978bdd2..158631bb39 100644 --- a/usr/src/uts/common/fs/zfs/dbuf.c +++ b/usr/src/uts/common/fs/zfs/dbuf.c @@ -25,6 +25,7 @@ * Copyright (c) 2013 by Saso Kiselkov. All rights reserved. * Copyright (c) 2013, Joyent, Inc. All rights reserved. * Copyright (c) 2014 Spectra Logic Corporation, All rights reserved. + * Copyright (c) 2014 Integros [integros.com] */ #include <sys/zfs_context.h> diff --git a/usr/src/uts/common/fs/zfs/dmu_objset.c b/usr/src/uts/common/fs/zfs/dmu_objset.c index 85465ec943..367dbcb9c2 100644 --- a/usr/src/uts/common/fs/zfs/dmu_objset.c +++ b/usr/src/uts/common/fs/zfs/dmu_objset.c @@ -26,6 +26,7 @@ * Copyright (c) 2014 Spectra Logic Corporation, All rights reserved. * Copyright 2015 Nexenta Systems, Inc. All rights reserved. * Copyright (c) 2015, STRATO AG, Inc. All rights reserved. + * Copyright (c) 2014 Integros [integros.com] */ /* Portions Copyright 2010 Robert Milkowski */ diff --git a/usr/src/uts/common/fs/zfs/dmu_send.c b/usr/src/uts/common/fs/zfs/dmu_send.c index 9d14b709df..4eb19dd9de 100644 --- a/usr/src/uts/common/fs/zfs/dmu_send.c +++ b/usr/src/uts/common/fs/zfs/dmu_send.c @@ -25,6 +25,7 @@ * Copyright (c) 2015, Joyent, Inc. All rights reserved. * Copyright 2014 HybridCluster. All rights reserved. * Copyright 2016 RackTop Systems. + * Copyright (c) 2014 Integros [integros.com] */ #include <sys/dmu.h> diff --git a/usr/src/uts/common/fs/zfs/dmu_tx.c b/usr/src/uts/common/fs/zfs/dmu_tx.c index da3a3df643..9d3db4212e 100644 --- a/usr/src/uts/common/fs/zfs/dmu_tx.c +++ b/usr/src/uts/common/fs/zfs/dmu_tx.c @@ -22,6 +22,7 @@ * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2011 Nexenta Systems, Inc. All rights reserved. * Copyright (c) 2012, 2015 by Delphix. All rights reserved. + * Copyright (c) 2014 Integros [integros.com] */ #include <sys/dmu.h> diff --git a/usr/src/uts/common/fs/zfs/dnode.c b/usr/src/uts/common/fs/zfs/dnode.c index 31ba4de04e..024c64897b 100644 --- a/usr/src/uts/common/fs/zfs/dnode.c +++ b/usr/src/uts/common/fs/zfs/dnode.c @@ -22,6 +22,7 @@ * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2012, 2015 by Delphix. All rights reserved. * Copyright (c) 2014 Spectra Logic Corporation, All rights reserved. + * Copyright (c) 2014 Integros [integros.com] */ #include <sys/zfs_context.h> diff --git a/usr/src/uts/common/fs/zfs/dsl_dataset.c b/usr/src/uts/common/fs/zfs/dsl_dataset.c index 31dc0df041..0605ccc324 100644 --- a/usr/src/uts/common/fs/zfs/dsl_dataset.c +++ b/usr/src/uts/common/fs/zfs/dsl_dataset.c @@ -24,6 +24,7 @@ * Copyright (c) 2014, Joyent, Inc. All rights reserved. * Copyright (c) 2014 RackTop Systems. * Copyright (c) 2014 Spectra Logic Corporation, All rights reserved. + * Copyright (c) 2014 Integros [integros.com] */ #include <sys/dmu_objset.h> diff --git a/usr/src/uts/common/fs/zfs/dsl_deadlist.c b/usr/src/uts/common/fs/zfs/dsl_deadlist.c index d26c6cd357..7e3a122c95 100644 --- a/usr/src/uts/common/fs/zfs/dsl_deadlist.c +++ b/usr/src/uts/common/fs/zfs/dsl_deadlist.c @@ -22,6 +22,7 @@ * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2012 by Delphix. All rights reserved. * Copyright (c) 2014 Spectra Logic Corporation, All rights reserved. + * Copyright (c) 2014 Integros [integros.com] */ #include <sys/dsl_dataset.h> diff --git a/usr/src/uts/common/fs/zfs/dsl_destroy.c b/usr/src/uts/common/fs/zfs/dsl_destroy.c index 7de9845079..b8971761d7 100644 --- a/usr/src/uts/common/fs/zfs/dsl_destroy.c +++ b/usr/src/uts/common/fs/zfs/dsl_destroy.c @@ -23,6 +23,7 @@ * Copyright (c) 2012, 2015 by Delphix. All rights reserved. * Copyright (c) 2013 Steven Hartland. All rights reserved. * Copyright (c) 2013 by Joyent, Inc. All rights reserved. + * Copyright (c) 2014 Integros [integros.com] */ #include <sys/zfs_context.h> diff --git a/usr/src/uts/common/fs/zfs/dsl_pool.c b/usr/src/uts/common/fs/zfs/dsl_pool.c index 2ba96d6323..242db1c9f1 100644 --- a/usr/src/uts/common/fs/zfs/dsl_pool.c +++ b/usr/src/uts/common/fs/zfs/dsl_pool.c @@ -23,6 +23,7 @@ * Copyright (c) 2011, 2014 by Delphix. All rights reserved. * Copyright (c) 2013 Steven Hartland. All rights reserved. * Copyright (c) 2014 Spectra Logic Corporation, All rights reserved. + * Copyright (c) 2014 Integros [integros.com] */ #include <sys/dsl_pool.h> diff --git a/usr/src/uts/common/fs/zfs/metaslab.c b/usr/src/uts/common/fs/zfs/metaslab.c index 237eae9653..296f0006fc 100644 --- a/usr/src/uts/common/fs/zfs/metaslab.c +++ b/usr/src/uts/common/fs/zfs/metaslab.c @@ -22,6 +22,7 @@ * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2011, 2015 by Delphix. All rights reserved. * Copyright (c) 2013 by Saso Kiselkov. All rights reserved. + * Copyright (c) 2014 Integros [integros.com] */ #include <sys/zfs_context.h> diff --git a/usr/src/uts/common/fs/zfs/sa.c b/usr/src/uts/common/fs/zfs/sa.c index 498a651292..3168b47304 100644 --- a/usr/src/uts/common/fs/zfs/sa.c +++ b/usr/src/uts/common/fs/zfs/sa.c @@ -25,6 +25,7 @@ * Copyright (c) 2013 by Delphix. All rights reserved. * Copyright (c) 2014 Spectra Logic Corporation, All rights reserved. * Copyright (c) 2015 Joyent, Inc. All rights reserved. + * Copyright (c) 2014 Integros [integros.com] */ #include <sys/zfs_context.h> diff --git a/usr/src/uts/common/fs/zfs/spa.c b/usr/src/uts/common/fs/zfs/spa.c index 912053db7d..1edac65700 100644 --- a/usr/src/uts/common/fs/zfs/spa.c +++ b/usr/src/uts/common/fs/zfs/spa.c @@ -25,6 +25,7 @@ * Copyright (c) 2015, Nexenta Systems, Inc. All rights reserved. * Copyright (c) 2014 Spectra Logic Corporation, All rights reserved. * Copyright 2013 Saso Kiselkov. All rights reserved. + * Copyright (c) 2014 Integros [integros.com] */ /* diff --git a/usr/src/uts/common/fs/zfs/spa_history.c b/usr/src/uts/common/fs/zfs/spa_history.c index 4923e3cba2..4c30736769 100644 --- a/usr/src/uts/common/fs/zfs/spa_history.c +++ b/usr/src/uts/common/fs/zfs/spa_history.c @@ -22,6 +22,7 @@ /* * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2011, 2014 by Delphix. All rights reserved. + * Copyright (c) 2014 Integros [integros.com] */ #include <sys/spa.h> diff --git a/usr/src/uts/common/fs/zfs/spa_misc.c b/usr/src/uts/common/fs/zfs/spa_misc.c index 6f255df850..699b15cc58 100644 --- a/usr/src/uts/common/fs/zfs/spa_misc.c +++ b/usr/src/uts/common/fs/zfs/spa_misc.c @@ -24,6 +24,7 @@ * Copyright 2015 Nexenta Systems, Inc. All rights reserved. * Copyright (c) 2014 Spectra Logic Corporation, All rights reserved. * Copyright 2013 Saso Kiselkov. All rights reserved. + * Copyright (c) 2014 Integros [integros.com] */ #include <sys/zfs_context.h> diff --git a/usr/src/uts/common/fs/zfs/sys/dmu.h b/usr/src/uts/common/fs/zfs/sys/dmu.h index c10806989d..adad5ab143 100644 --- a/usr/src/uts/common/fs/zfs/sys/dmu.h +++ b/usr/src/uts/common/fs/zfs/sys/dmu.h @@ -28,6 +28,7 @@ * Copyright 2014 HybridCluster. All rights reserved. * Copyright (c) 2014 Spectra Logic Corporation, All rights reserved. * Copyright 2013 Saso Kiselkov. All rights reserved. + * Copyright (c) 2014 Integros [integros.com] */ /* Portions Copyright 2010 Robert Milkowski */ diff --git a/usr/src/uts/common/fs/zfs/sys/dmu_objset.h b/usr/src/uts/common/fs/zfs/sys/dmu_objset.h index 8a263a39e6..f05b2cf453 100644 --- a/usr/src/uts/common/fs/zfs/sys/dmu_objset.h +++ b/usr/src/uts/common/fs/zfs/sys/dmu_objset.h @@ -23,6 +23,7 @@ * Copyright (c) 2012, 2014 by Delphix. All rights reserved. * Copyright (c) 2013 by Saso Kiselkov. All rights reserved. * Copyright (c) 2014 Spectra Logic Corporation, All rights reserved. + * Copyright (c) 2014 Integros [integros.com] */ /* Portions Copyright 2010 Robert Milkowski */ diff --git a/usr/src/uts/common/fs/zfs/sys/dmu_send.h b/usr/src/uts/common/fs/zfs/sys/dmu_send.h index 871f562546..21d9cb4bb0 100644 --- a/usr/src/uts/common/fs/zfs/sys/dmu_send.h +++ b/usr/src/uts/common/fs/zfs/sys/dmu_send.h @@ -24,6 +24,7 @@ * Copyright (c) 2012, 2014 by Delphix. All rights reserved. * Copyright 2011 Nexenta Systems, Inc. All rights reserved. * Copyright (c) 2013, Joyent, Inc. All rights reserved. + * Copyright (c) 2014 Integros [integros.com] */ #ifndef _DMU_SEND_H diff --git a/usr/src/uts/common/fs/zfs/sys/dsl_dataset.h b/usr/src/uts/common/fs/zfs/sys/dsl_dataset.h index d7df05b309..766ae3c811 100644 --- a/usr/src/uts/common/fs/zfs/sys/dsl_dataset.h +++ b/usr/src/uts/common/fs/zfs/sys/dsl_dataset.h @@ -24,6 +24,7 @@ * Copyright (c) 2013, Joyent, Inc. All rights reserved. * Copyright (c) 2013 Steven Hartland. All rights reserved. * Copyright (c) 2014 Spectra Logic Corporation, All rights reserved. + * Copyright (c) 2014 Integros [integros.com] */ #ifndef _SYS_DSL_DATASET_H diff --git a/usr/src/uts/common/fs/zfs/sys/spa.h b/usr/src/uts/common/fs/zfs/sys/spa.h index 7ac7839033..d8840bf86d 100644 --- a/usr/src/uts/common/fs/zfs/sys/spa.h +++ b/usr/src/uts/common/fs/zfs/sys/spa.h @@ -24,6 +24,7 @@ * Copyright 2011 Nexenta Systems, Inc. All rights reserved. * Copyright (c) 2014 Spectra Logic Corporation, All rights reserved. * Copyright 2013 Saso Kiselkov. All rights reserved. + * Copyright (c) 2014 Integros [integros.com] */ #ifndef _SYS_SPA_H diff --git a/usr/src/uts/common/fs/zfs/sys/zap_impl.h b/usr/src/uts/common/fs/zfs/sys/zap_impl.h index acc795cbc4..e05534f8a5 100644 --- a/usr/src/uts/common/fs/zfs/sys/zap_impl.h +++ b/usr/src/uts/common/fs/zfs/sys/zap_impl.h @@ -22,6 +22,7 @@ * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2013 by Delphix. All rights reserved. * Copyright (c) 2014 Spectra Logic Corporation, All rights reserved. + * Copyright (c) 2014 Integros [integros.com] */ #ifndef _SYS_ZAP_IMPL_H diff --git a/usr/src/uts/common/fs/zfs/sys/zfs_ioctl.h b/usr/src/uts/common/fs/zfs/sys/zfs_ioctl.h index 5d3d2d91df..3bc1a90322 100644 --- a/usr/src/uts/common/fs/zfs/sys/zfs_ioctl.h +++ b/usr/src/uts/common/fs/zfs/sys/zfs_ioctl.h @@ -22,6 +22,7 @@ * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2012, 2015 by Delphix. All rights reserved. * Copyright 2016 RackTop Systems. + * Copyright (c) 2014 Integros [integros.com] */ #ifndef _SYS_ZFS_IOCTL_H diff --git a/usr/src/uts/common/fs/zfs/sys/zfs_znode.h b/usr/src/uts/common/fs/zfs/sys/zfs_znode.h index df08aad7b4..6a2a90ab45 100644 --- a/usr/src/uts/common/fs/zfs/sys/zfs_znode.h +++ b/usr/src/uts/common/fs/zfs/sys/zfs_znode.h @@ -21,6 +21,7 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2012 by Delphix. All rights reserved. + * Copyright (c) 2014 Integros [integros.com] */ #ifndef _SYS_FS_ZFS_ZNODE_H diff --git a/usr/src/uts/common/fs/zfs/sys/zil.h b/usr/src/uts/common/fs/zfs/sys/zil.h index d3fe6e9653..1642da0819 100644 --- a/usr/src/uts/common/fs/zfs/sys/zil.h +++ b/usr/src/uts/common/fs/zfs/sys/zil.h @@ -21,6 +21,7 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2012 by Delphix. All rights reserved. + * Copyright (c) 2014 Integros [integros.com] */ /* Portions Copyright 2010 Robert Milkowski */ diff --git a/usr/src/uts/common/fs/zfs/sys/zil_impl.h b/usr/src/uts/common/fs/zfs/sys/zil_impl.h index b5c666c02b..ac908bd322 100644 --- a/usr/src/uts/common/fs/zfs/sys/zil_impl.h +++ b/usr/src/uts/common/fs/zfs/sys/zil_impl.h @@ -21,6 +21,7 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2012 by Delphix. All rights reserved. + * Copyright (c) 2014 Integros [integros.com] */ /* Portions Copyright 2010 Robert Milkowski */ diff --git a/usr/src/uts/common/fs/zfs/vdev.c b/usr/src/uts/common/fs/zfs/vdev.c index 1c57fce4dc..08ff8871e9 100644 --- a/usr/src/uts/common/fs/zfs/vdev.c +++ b/usr/src/uts/common/fs/zfs/vdev.c @@ -23,6 +23,7 @@ * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2011, 2015 by Delphix. All rights reserved. * Copyright 2015 Nexenta Systems, Inc. All rights reserved. + * Copyright (c) 2014 Integros [integros.com] */ #include <sys/zfs_context.h> diff --git a/usr/src/uts/common/fs/zfs/vdev_queue.c b/usr/src/uts/common/fs/zfs/vdev_queue.c index 3e32917057..cc415e2ca0 100644 --- a/usr/src/uts/common/fs/zfs/vdev_queue.c +++ b/usr/src/uts/common/fs/zfs/vdev_queue.c @@ -26,6 +26,7 @@ /* * Copyright (c) 2012, 2014 by Delphix. All rights reserved. + * Copyright (c) 2014 Integros [integros.com] */ #include <sys/zfs_context.h> diff --git a/usr/src/uts/common/fs/zfs/vdev_raidz.c b/usr/src/uts/common/fs/zfs/vdev_raidz.c index 085d1250a1..ff06896e8d 100644 --- a/usr/src/uts/common/fs/zfs/vdev_raidz.c +++ b/usr/src/uts/common/fs/zfs/vdev_raidz.c @@ -23,6 +23,7 @@ * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2012, 2014 by Delphix. All rights reserved. * Copyright (c) 2013, Joyent, Inc. All rights reserved. + * Copyright (c) 2014 Integros [integros.com] */ #include <sys/zfs_context.h> diff --git a/usr/src/uts/common/fs/zfs/zap_micro.c b/usr/src/uts/common/fs/zfs/zap_micro.c index 689c7958de..f51cc7b529 100644 --- a/usr/src/uts/common/fs/zfs/zap_micro.c +++ b/usr/src/uts/common/fs/zfs/zap_micro.c @@ -22,6 +22,7 @@ * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2011, 2014 by Delphix. All rights reserved. * Copyright (c) 2014 Spectra Logic Corporation, All rights reserved. + * Copyright (c) 2014 Integros [integros.com] */ #include <sys/zio.h> diff --git a/usr/src/uts/common/fs/zfs/zfs_ioctl.c b/usr/src/uts/common/fs/zfs/zfs_ioctl.c index 98c67abb78..8644957f98 100644 --- a/usr/src/uts/common/fs/zfs/zfs_ioctl.c +++ b/usr/src/uts/common/fs/zfs/zfs_ioctl.c @@ -28,6 +28,7 @@ * Copyright (c) 2011, 2015 by Delphix. All rights reserved. * Copyright (c) 2013 by Saso Kiselkov. All rights reserved. * Copyright (c) 2013 Steven Hartland. All rights reserved. + * Copyright (c) 2014 Integros [integros.com] */ /* diff --git a/usr/src/uts/common/fs/zfs/zfs_log.c b/usr/src/uts/common/fs/zfs/zfs_log.c index 4fb57e9c22..99a3917289 100644 --- a/usr/src/uts/common/fs/zfs/zfs_log.c +++ b/usr/src/uts/common/fs/zfs/zfs_log.c @@ -21,6 +21,7 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2015 by Delphix. All rights reserved. + * Copyright (c) 2014 Integros [integros.com] */ #include <sys/types.h> diff --git a/usr/src/uts/common/fs/zfs/zfs_vfsops.c b/usr/src/uts/common/fs/zfs/zfs_vfsops.c index daa8289502..6b9d9f90f5 100644 --- a/usr/src/uts/common/fs/zfs/zfs_vfsops.c +++ b/usr/src/uts/common/fs/zfs/zfs_vfsops.c @@ -22,6 +22,7 @@ * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2012, Joyent, Inc. All rights reserved. * Copyright (c) 2012, 2014 by Delphix. All rights reserved. + * Copyright (c) 2014 Integros [integros.com] */ /* Portions Copyright 2010 Robert Milkowski */ diff --git a/usr/src/uts/common/fs/zfs/zfs_vnops.c b/usr/src/uts/common/fs/zfs/zfs_vnops.c index 95630d9a9c..650939e7ed 100644 --- a/usr/src/uts/common/fs/zfs/zfs_vnops.c +++ b/usr/src/uts/common/fs/zfs/zfs_vnops.c @@ -23,6 +23,7 @@ * Copyright (c) 2012, 2015 by Delphix. All rights reserved. * Copyright 2014 Nexenta Systems, Inc. All rights reserved. * Copyright 2015 Joyent, Inc. All rights reserved. + * Copyright (c) 2014 Integros [integros.com] */ /* Portions Copyright 2007 Jeremy Teo */ diff --git a/usr/src/uts/common/fs/zfs/zfs_znode.c b/usr/src/uts/common/fs/zfs/zfs_znode.c index 440f850181..ccc9be21b5 100644 --- a/usr/src/uts/common/fs/zfs/zfs_znode.c +++ b/usr/src/uts/common/fs/zfs/zfs_znode.c @@ -21,6 +21,7 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2012, 2014 by Delphix. All rights reserved. + * Copyright (c) 2014 Integros [integros.com] */ /* Portions Copyright 2007 Jeremy Teo */ diff --git a/usr/src/uts/common/fs/zfs/zil.c b/usr/src/uts/common/fs/zfs/zil.c index f9f93999db..abbb31a199 100644 --- a/usr/src/uts/common/fs/zfs/zil.c +++ b/usr/src/uts/common/fs/zfs/zil.c @@ -22,6 +22,7 @@ * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2011, 2014 by Delphix. All rights reserved. * Copyright (c) 2014, Joyent, Inc. All rights reserved. + * Copyright (c) 2014 Integros [integros.com] */ /* Portions Copyright 2010 Robert Milkowski */ diff --git a/usr/src/uts/common/fs/zfs/zio.c b/usr/src/uts/common/fs/zfs/zio.c index 6603184f39..0bbeba3483 100644 --- a/usr/src/uts/common/fs/zfs/zio.c +++ b/usr/src/uts/common/fs/zfs/zio.c @@ -23,6 +23,7 @@ * Copyright (c) 2011, 2015 by Delphix. All rights reserved. * Copyright (c) 2011 Nexenta Systems, Inc. All rights reserved. * Copyright (c) 2013 by Saso Kiselkov. All rights reserved. + * Copyright (c) 2014 Integros [integros.com] */ #include <sys/sysmacros.h> diff --git a/usr/src/uts/common/fs/zfs/zvol.c b/usr/src/uts/common/fs/zfs/zvol.c index 62f795186d..535bc057b9 100644 --- a/usr/src/uts/common/fs/zfs/zvol.c +++ b/usr/src/uts/common/fs/zfs/zvol.c @@ -26,6 +26,7 @@ * Copyright 2011 Nexenta Systems, Inc. All rights reserved. * Copyright (c) 2012, 2014 by Delphix. All rights reserved. * Copyright (c) 2014, Joyent, Inc. All rights reserved. + * Copyright (c) 2014 Integros [integros.com] */ /* diff --git a/usr/src/uts/common/sys/fs/zfs.h b/usr/src/uts/common/sys/fs/zfs.h index bc9f057dd1..6301f25087 100644 --- a/usr/src/uts/common/sys/fs/zfs.h +++ b/usr/src/uts/common/sys/fs/zfs.h @@ -24,6 +24,7 @@ * Copyright (c) 2011, 2014 by Delphix. All rights reserved. * Copyright 2011 Nexenta Systems, Inc. All rights reserved. * Copyright (c) 2013, Joyent, Inc. All rights reserved. + * Copyright (c) 2014 Integros [integros.com] */ /* Portions Copyright 2010 Robert Milkowski */ |