2882 implement libzfs_core
2883 changing "canmount" property to "on" should not always remount dataset
2900 "zfs snapshot" should be able to create multiple, arbitrary snapshots at once
Reviewed by: George Wilson <george.wilson@delphix.com>
Reviewed by: Chris Siden <christopher.siden@delphix.com>
Reviewed by: Garrett D'Amore <garrett@damore.org>
Reviewed by: Bill Pijewski <wdp@joyent.com>
Reviewed by: Dan Kruchinin <dan.kruchinin@gmail.com>

          --- old/usr/src/cmd/zfs/Makefile
          +++ new/usr/src/cmd/zfs/Makefile

   1    1  #
   2    2  # CDDL HEADER START
   3    3  #
   4    4  # The contents of this file are subject to the terms of the
   5    5  # Common Development and Distribution License (the "License").
   6    6  # You may not use this file except in compliance with the License.
   7    7  #
   8    8  # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
   9    9  # or http://www.opensolaris.org/os/licensing.
  10   10  # See the License for the specific language governing permissions

  11   11  # and limitations under the License.
  12   12  #
  13   13  # When distributing Covered Code, include this CDDL HEADER in each
  14   14  # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  15   15  # If applicable, add the following below this CDDL HEADER, with the
  16   16  # fields enclosed by brackets "[]" replaced with your own identifying
  17   17  # information: Portions Copyright [yyyy] [name of copyright owner]
  18   18  #
  19   19  # CDDL HEADER END
  20   20  #
  21      -#
  22   21  # Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
  23      -# Copyright 2010 Nexenta Systems, Inc. All rights reserved.
  24   22  # Use is subject to license terms.
  25   23  #
       24 +# Copyright 2010 Nexenta Systems, Inc. All rights reserved.
       25 +# Copyright (c) 2012 by Delphix. All rights reserved.
       26 +#
  26   27  
  27   28  PROG=           zfs
  28   29  OBJS=           zfs_main.o zfs_iter.o
  29   30  SRCS=           $(OBJS:%.o=%.c)
  30   31  POFILES=        zfs_main.po zfs_iter.po
  31   32  POFILE=         zfs.po
  32   33  
  33   34  include ../Makefile.cmd
  34   35  include ../Makefile.ctf
  35   36  
  36   37  FSTYPE=         zfs
  37   38  LINKPROGS=      mount umount
  38   39  ROOTETCFSTYPE=  $(ROOTETC)/fs/$(FSTYPE)
  39   40  USRLIBFSTYPE=   $(ROOTLIB)/fs/$(FSTYPE)
  40   41  
  41      -LDLIBS += -lzfs -luutil -lumem -lnvpair -lsec -lidmap
       42 +LDLIBS += -lzfs_core -lzfs -luutil -lumem -lnvpair -lsec -lidmap
  42   43  
  43   44  INCS += -I../../common/zfs
  44   45  
  45   46  C99MODE=        -xc99=%all
  46   47  C99LMODE=       -Xc99=%all
  47   48  
  48   49  CPPFLAGS += -D_LARGEFILE64_SOURCE=1 -D_REENTRANT $(INCS)
  49   50  $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG
  50   51  
  51   52  # lint complains about unused _umem_* functions

  52   53  LINTFLAGS += -xerroff=E_NAME_DEF_NOT_USED2 
  53   54  LINTFLAGS64 += -xerroff=E_NAME_DEF_NOT_USED2 
  54   55  
  55   56  ROOTUSRSBINLINKS = $(PROG:%=$(ROOTUSRSBIN)/%)
  56   57  USRLIBFSTYPELINKS = $(LINKPROGS:%=$(USRLIBFSTYPE)/%)
  57   58  ROOTETCFSTYPELINKS = $(LINKPROGS:%=$(ROOTETCFSTYPE)/%)
  58   59  
  59   60  .KEEP_STATE:
  60   61  
  61   62  .PARALLEL:
  62   63  
  63   64  all: $(PROG)
  64   65  
  65   66  $(PROG): $(OBJS)
  66   67          $(LINK.c) -o $@ $(OBJS) $(LDLIBS)
  67   68          $(POST_PROCESS)
  68   69  
  69   70  install: all $(ROOTSBINPROG) $(ROOTUSRSBINLINKS) $(USRLIBFSTYPELINKS) \
  70   71          $(ROOTETCFSTYPELINKS)
  71   72  
  72   73  $(POFILE): $(POFILES)
  73   74          $(RM) $@
  74   75          cat $(POFILES) > $@
  75   76  
  76   77  clean:
  77   78          $(RM) $(OBJS)
  78   79  
  79   80  lint:   lint_SRCS
  80   81  
  81   82  # Links from /usr/sbin to /sbin
  82   83  $(ROOTUSRSBINLINKS):
  83   84          -$(RM) $@; $(SYMLINK) ../../sbin/$(PROG) $@
  84   85  
  85   86  # Links from /usr/lib/fs/zfs to /sbin
  86   87  $(USRLIBFSTYPELINKS):
  87   88          -$(RM) $@; $(SYMLINK) ../../../../sbin/$(PROG) $@
  88   89  
  89   90  # Links from /etc/fs/zfs to /sbin
  90   91  $(ROOTETCFSTYPELINKS):
  91   92          -$(RM) $@; $(SYMLINK) ../../../sbin/$(PROG) $@
  92   93  
  93   94  FRC:
  94   95  
  95   96  include ../Makefile.targ

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX