Print this page 
NEX-9559 remove nza-closed cruft
Reviewed by: Roman Strashkin <roman.strashkin@nexenta.com>
Reviewed by: Steve Peng <steve.peng@nexenta.com>
NEX-3508 CLONE - Port NEX-2946 Add UNMAP/TRIM functionality to ZFS and illumos
Reviewed by: Josef Sipek <josef.sipek@nexenta.com>
Reviewed by: Alek Pinchuk <alek.pinchuk@nexenta.com>
Conflicts:
    usr/src/uts/common/io/scsi/targets/sd.c
    usr/src/uts/common/sys/scsi/targets/sddef.h
Fix up some merges where we wanted the upstream version.
re #12585 rb4049 ZFS++ work port - refactoring to improve separation of open/closed code, bug fixes, performance improvements - open code


  12 #
  13 # When distributing Covered Code, include this CDDL HEADER in each
  14 # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  15 # If applicable, add the following below this CDDL HEADER, with the
  16 # fields enclosed by brackets "[]" replaced with your own identifying
  17 # information: Portions Copyright [yyyy] [name of copyright owner]
  18 #
  19 # CDDL HEADER END
  20 #
  21 #
  22 # Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  23 # Copyright (c) 2013, 2016 by Delphix. All rights reserved.
  24 # Copyright 2017 Joyent, Inc.
  25 #
  26 
  27 LIBRARY= libzpool.a
  28 VERS= .1
  29 
  30 # include the list of ZFS sources
  31 include ../../../uts/common/Makefile.files
  32 KERNEL_OBJS = kernel.o util.o
  33 DTRACE_OBJS = zfs.o
  34 
  35 OBJECTS=$(LUA_OBJS) $(ZFS_COMMON_OBJS) $(ZFS_SHARED_OBJS) $(KERNEL_OBJS)
  36 
  37 # include library definitions
  38 include ../../Makefile.lib
  39 
  40 LUA_SRCS=               $(LUA_OBJS:%.o=../../../uts/common/fs/zfs/lua/%.c)
  41 ZFS_COMMON_SRCS=        $(ZFS_COMMON_OBJS:%.o=../../../uts/common/fs/zfs/%.c)
  42 ZFS_SHARED_SRCS=        $(ZFS_SHARED_OBJS:%.o=../../../common/zfs/%.c)
  43 KERNEL_SRCS=            $(KERNEL_OBJS:%.o=../common/%.c)
  44 
  45 SRCS=$(LUA_SRCS) $(ZFS_COMMON_SRCS) $(ZFS_SHARED_SRCS) $(KERNEL_SRCS)
  46 SRCDIR=         ../common
  47 
  48 # There should be a mapfile here
  49 MAPFILES =
  50 
  51 LIBS +=         $(LINTLIB) $(DYNLIB)
  52 


  94 EXTPICS= $(DTRACE_OBJS:%=pics/%)
  95 
  96 pics/%.o: ../../../uts/common/fs/zfs/%.c ../common/zfs.h
  97         $(COMPILE.c) -o $@ $<
  98         $(POST_PROCESS_O)
  99 
 100 pics/%.o: ../../../uts/common/fs/zfs/lua/%.c
 101         $(COMPILE.c) -o $@ $<
 102         $(POST_PROCESS_O)
 103 
 104 pics/%.o: ../../../common/zfs/%.c ../common/zfs.h
 105         $(COMPILE.c) -o $@ $<
 106         $(POST_PROCESS_O)
 107 
 108 pics/%.o: ../common/%.d $(PICS)
 109         $(COMPILE.d) -C -s $< -o $@ $(PICS)
 110         $(POST_PROCESS_O)
 111 
 112 ../common/%.h: ../common/%.d
 113         $(DTRACE) -xnolibs -h -s $< -o $@







  12 #
  13 # When distributing Covered Code, include this CDDL HEADER in each
  14 # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  15 # If applicable, add the following below this CDDL HEADER, with the
  16 # fields enclosed by brackets "[]" replaced with your own identifying
  17 # information: Portions Copyright [yyyy] [name of copyright owner]
  18 #
  19 # CDDL HEADER END
  20 #
  21 #
  22 # Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  23 # Copyright (c) 2013, 2016 by Delphix. All rights reserved.
  24 # Copyright 2017 Joyent, Inc.
  25 #
  26 
  27 LIBRARY= libzpool.a
  28 VERS= .1
  29 
  30 # include the list of ZFS sources
  31 include ../../../uts/common/Makefile.files
  32 KERNEL_OBJS = kernel.o util.o dkioc_free_util.o
  33 DTRACE_OBJS = zfs.o
  34 
  35 OBJECTS=$(LUA_OBJS) $(ZFS_COMMON_OBJS) $(ZFS_SHARED_OBJS) $(KERNEL_OBJS)
  36 
  37 # include library definitions
  38 include ../../Makefile.lib
  39 
  40 LUA_SRCS=               $(LUA_OBJS:%.o=../../../uts/common/fs/zfs/lua/%.c)
  41 ZFS_COMMON_SRCS=        $(ZFS_COMMON_OBJS:%.o=../../../uts/common/fs/zfs/%.c)
  42 ZFS_SHARED_SRCS=        $(ZFS_SHARED_OBJS:%.o=../../../common/zfs/%.c)
  43 KERNEL_SRCS=            $(KERNEL_OBJS:%.o=../common/%.c)
  44 
  45 SRCS=$(LUA_SRCS) $(ZFS_COMMON_SRCS) $(ZFS_SHARED_SRCS) $(KERNEL_SRCS)
  46 SRCDIR=         ../common
  47 
  48 # There should be a mapfile here
  49 MAPFILES =
  50 
  51 LIBS +=         $(LINTLIB) $(DYNLIB)
  52 


  94 EXTPICS= $(DTRACE_OBJS:%=pics/%)
  95 
  96 pics/%.o: ../../../uts/common/fs/zfs/%.c ../common/zfs.h
  97         $(COMPILE.c) -o $@ $<
  98         $(POST_PROCESS_O)
  99 
 100 pics/%.o: ../../../uts/common/fs/zfs/lua/%.c
 101         $(COMPILE.c) -o $@ $<
 102         $(POST_PROCESS_O)
 103 
 104 pics/%.o: ../../../common/zfs/%.c ../common/zfs.h
 105         $(COMPILE.c) -o $@ $<
 106         $(POST_PROCESS_O)
 107 
 108 pics/%.o: ../common/%.d $(PICS)
 109         $(COMPILE.d) -C -s $< -o $@ $(PICS)
 110         $(POST_PROCESS_O)
 111 
 112 ../common/%.h: ../common/%.d
 113         $(DTRACE) -xnolibs -h -s $< -o $@
 114 
 115 pics/%.o: ../../../uts/common/os/%.c
 116         $(COMPILE.c) -o $@ $<
 117         $(POST_PROCESS_O)