diff options
| author | oshogbo <oshogbo@FreeBSD.org> | 2015-07-09 21:53:40 +0000 |
|---|---|---|
| committer | oshogbo <oshogbo@FreeBSD.org> | 2015-07-09 21:53:40 +0000 |
| commit | 3f0ef50892e3092893c7c05c5a22d9f1f3646a86 (patch) | |
| tree | 6d18e80adb93e6db25ed89481ed6ebafe93b62a7 | |
| parent | 6a4a0db965117b7d69bde849601dd6d2160a34e0 (diff) | |
| download | FreeBSD-src-3f0ef50892e3092893c7c05c5a22d9f1f3646a86.zip FreeBSD-src-3f0ef50892e3092893c7c05c5a22d9f1f3646a86.tar.gz | |
Rename zfs nvpair files to not colidate with our nvlist.
PR: 201356
Approved by: pjd (mentor)
| -rw-r--r-- | cddl/lib/libnvpair/Makefile | 6 | ||||
| -rw-r--r-- | sys/cddl/contrib/opensolaris/common/nvpair/opensolaris_fnvpair.c (renamed from sys/cddl/contrib/opensolaris/common/nvpair/fnvpair.c) | 0 | ||||
| -rw-r--r-- | sys/cddl/contrib/opensolaris/common/nvpair/opensolaris_nvpair.c (renamed from sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c) | 0 | ||||
| -rw-r--r-- | sys/cddl/contrib/opensolaris/common/nvpair/opensolaris_nvpair_alloc_fixed.c (renamed from sys/cddl/contrib/opensolaris/common/nvpair/nvpair_alloc_fixed.c) | 0 | ||||
| -rw-r--r-- | sys/conf/files | 6 | ||||
| -rw-r--r-- | sys/modules/zfs/Makefile | 6 |
6 files changed, 9 insertions, 9 deletions
diff --git a/cddl/lib/libnvpair/Makefile b/cddl/lib/libnvpair/Makefile index 6b6f51d..98bdb47 100644 --- a/cddl/lib/libnvpair/Makefile +++ b/cddl/lib/libnvpair/Makefile @@ -7,10 +7,10 @@ LIB= nvpair SRCS= libnvpair.c \ nvpair_alloc_system.c \ - nvpair_alloc_fixed.c \ - nvpair.c \ nvpair_json.c \ - fnvpair.c + opensolaris_fnvpair.c \ + opensolaris_nvpair.c \ + opensolaris_nvpair_alloc_fixed.c WARNS?= 0 CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include diff --git a/sys/cddl/contrib/opensolaris/common/nvpair/fnvpair.c b/sys/cddl/contrib/opensolaris/common/nvpair/opensolaris_fnvpair.c index eb200a2..eb200a2 100644 --- a/sys/cddl/contrib/opensolaris/common/nvpair/fnvpair.c +++ b/sys/cddl/contrib/opensolaris/common/nvpair/opensolaris_fnvpair.c diff --git a/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c b/sys/cddl/contrib/opensolaris/common/nvpair/opensolaris_nvpair.c index cd6af4e..cd6af4e 100644 --- a/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c +++ b/sys/cddl/contrib/opensolaris/common/nvpair/opensolaris_nvpair.c diff --git a/sys/cddl/contrib/opensolaris/common/nvpair/nvpair_alloc_fixed.c b/sys/cddl/contrib/opensolaris/common/nvpair/opensolaris_nvpair_alloc_fixed.c index 620171e..620171e 100644 --- a/sys/cddl/contrib/opensolaris/common/nvpair/nvpair_alloc_fixed.c +++ b/sys/cddl/contrib/opensolaris/common/nvpair/opensolaris_nvpair_alloc_fixed.c diff --git a/sys/conf/files b/sys/conf/files index bbac01b..e2fdfc8 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -125,9 +125,9 @@ cddl/compat/opensolaris/kern/opensolaris_vm.c optional zfs compile-with "${ZF cddl/compat/opensolaris/kern/opensolaris_zone.c optional zfs compile-with "${ZFS_C}" cddl/contrib/opensolaris/common/acl/acl_common.c optional zfs compile-with "${ZFS_C}" cddl/contrib/opensolaris/common/avl/avl.c optional zfs compile-with "${ZFS_C}" -cddl/contrib/opensolaris/common/nvpair/fnvpair.c optional zfs compile-with "${ZFS_C}" -cddl/contrib/opensolaris/common/nvpair/nvpair.c optional zfs compile-with "${ZFS_C}" -cddl/contrib/opensolaris/common/nvpair/nvpair_alloc_fixed.c optional zfs compile-with "${ZFS_C}" +cddl/contrib/opensolaris/common/nvpair/opensolaris_fnvpair.c optional zfs compile-with "${ZFS_C}" +cddl/contrib/opensolaris/common/nvpair/opensolaris_nvpair.c optional zfs compile-with "${ZFS_C}" +cddl/contrib/opensolaris/common/nvpair/opensolaris_nvpair_alloc_fixed.c optional zfs compile-with "${ZFS_C}" cddl/contrib/opensolaris/common/unicode/u8_textprep.c optional zfs compile-with "${ZFS_C}" cddl/contrib/opensolaris/common/zfs/zfeature_common.c optional zfs compile-with "${ZFS_C}" cddl/contrib/opensolaris/common/zfs/zfs_comutil.c optional zfs compile-with "${ZFS_C}" diff --git a/sys/modules/zfs/Makefile b/sys/modules/zfs/Makefile index 29f4ae0..05d226c 100644 --- a/sys/modules/zfs/Makefile +++ b/sys/modules/zfs/Makefile @@ -13,9 +13,9 @@ SRCS+= acl_common.c .PATH: ${SUNW}/common/avl SRCS+= avl.c .PATH: ${SUNW}/common/nvpair -SRCS+= nvpair.c -SRCS+= nvpair_alloc_fixed.c -SRCS+= fnvpair.c +SRCS+= opensolaris_nvpair.c +SRCS+= opensolaris_nvpair_alloc_fixed.c +SRCS+= opensolaris_fnvpair.c .PATH: ${SYSDIR}/cddl/contrib/opensolaris/common/unicode SRCS+= u8_textprep.c |
