illumos-merge Cdiff usr/src/Targetdirs

Print this page

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>


*** 20,29 ****
--- 20,30 ----
  
  #
  # Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved.
  # Copyright 2011, Richard Lowe
  # Copyright 2011 Nexenta Systems, Inc. All rights reserved.
+ # Copyright (c) 2012 by Delphix. All rights reserved.
  #
  
  #
  # It is easier to think in terms of directory names without the ROOT macro
  # prefix.  ROOTDIRS is TARGETDIRS with ROOT prefixes.  It is necessary
*** 1029,1038 ****
--- 1030,1041 ----
  $(ROOT)/usr/lib/libw.so:=               REALPATH=../../lib/libw.so.1
  $(ROOT)/usr/lib/libxnet.so.1:=          REALPATH=../../lib/libxnet.so.1
  $(ROOT)/usr/lib/libxnet.so:=            REALPATH=../../lib/libxnet.so.1
  $(ROOT)/usr/lib/libzfs.so.1:=           REALPATH=../../lib/libzfs.so.1
  $(ROOT)/usr/lib/libzfs.so:=             REALPATH=../../lib/libzfs.so.1
+ $(ROOT)/usr/lib/libzfs_core.so.1:=      REALPATH=../../lib/libzfs_core.so.1
+ $(ROOT)/usr/lib/libzfs_core.so:=        REALPATH=../../lib/libzfs_core.so.1
  $(ROOT)/usr/lib/llib-ladm.ln:=          REALPATH=../../lib/llib-ladm.ln
  $(ROOT)/usr/lib/llib-ladm:=             REALPATH=../../lib/llib-ladm
  $(ROOT)/usr/lib/llib-laio.ln:=          REALPATH=../../lib/llib-laio.ln
  $(ROOT)/usr/lib/llib-laio:=             REALPATH=../../lib/llib-laio
  $(ROOT)/usr/lib/llib-lavl.ln:=          REALPATH=../../lib/llib-lavl.ln
*** 1129,1138 ****
--- 1132,1143 ----
  $(ROOT)/usr/lib/llib-luuid:=            REALPATH=../../lib/llib-luuid
  $(ROOT)/usr/lib/llib-lxnet.ln:=         REALPATH=../../lib/llib-lxnet.ln
  $(ROOT)/usr/lib/llib-lxnet:=            REALPATH=../../lib/llib-lxnet
  $(ROOT)/usr/lib/llib-lzfs.ln:=          REALPATH=../../lib/llib-lzfs.ln
  $(ROOT)/usr/lib/llib-lzfs:=             REALPATH=../../lib/llib-lzfs
+ $(ROOT)/usr/lib/llib-lzfs_core.ln:=     REALPATH=../../lib/llib-lzfs_core.ln
+ $(ROOT)/usr/lib/llib-lzfs_core:=        REALPATH=../../lib/llib-lzfs_core
  $(ROOT)/usr/lib/nss_compat.so.1:=       REALPATH=../../lib/nss_compat.so.1
  $(ROOT)/usr/lib/nss_dns.so.1:=          REALPATH=../../lib/nss_dns.so.1
  $(ROOT)/usr/lib/nss_files.so.1:=        REALPATH=../../lib/nss_files.so.1
  $(ROOT)/usr/lib/nss_nis.so.1:=          REALPATH=../../lib/nss_nis.so.1
  $(ROOT)/usr/lib/nss_user.so.1:=         REALPATH=../../lib/nss_user.so.1
*** 1375,1384 ****
--- 1380,1393 ----
          REALPATH=../../../lib/$(MACH64)/libxnet.so.1
  $(ROOT)/usr/lib/$(MACH64)/libzfs.so:= \
          REALPATH=../../../lib/$(MACH64)/libzfs.so.1
  $(ROOT)/usr/lib/$(MACH64)/libzfs.so.1:= \
          REALPATH=../../../lib/$(MACH64)/libzfs.so.1
+ $(ROOT)/usr/lib/$(MACH64)/libzfs_core.so:= \
+         REALPATH=../../../lib/$(MACH64)/libzfs_core.so.1
+ $(ROOT)/usr/lib/$(MACH64)/libzfs_core.so.1:= \
+         REALPATH=../../../lib/$(MACH64)/libzfs_core.so.1
  $(ROOT)/usr/lib/$(MACH64)/libfdisk.so.1:= \
          REALPATH=../../../lib/$(MACH64)/libfdisk.so.1
  $(ROOT)/usr/lib/$(MACH64)/libfdisk.so:= \
          REALPATH=../../../lib/$(MACH64)/libfdisk.so.1
  $(ROOT)/usr/lib/$(MACH64)/llib-ladm.ln:= \
*** 1471,1480 ****
--- 1480,1491 ----
          REALPATH=../../../lib/$(MACH64)/llib-luuid.ln
  $(ROOT)/usr/lib/$(MACH64)/llib-lxnet.ln:= \
          REALPATH=../../../lib/$(MACH64)/llib-lxnet.ln
  $(ROOT)/usr/lib/$(MACH64)/llib-lzfs.ln:= \
          REALPATH=../../../lib/$(MACH64)/llib-lzfs.ln
+ $(ROOT)/usr/lib/$(MACH64)/llib-lzfs_core.ln:= \
+         REALPATH=../../../lib/$(MACH64)/llib-lzfs_core.ln
  $(ROOT)/usr/lib/$(MACH64)/llib-lfdisk.ln:= \
          REALPATH=../../../lib/$(MACH64)/llib-lfdisk.ln
  $(ROOT)/usr/lib/$(MACH64)/nss_compat.so.1:= \
          REALPATH=../../../lib/$(MACH64)/nss_compat.so.1
  $(ROOT)/usr/lib/$(MACH64)/nss_dns.so.1:= \
*** 1625,1634 ****
--- 1636,1647 ----
          /usr/lib/libw.so.1 \
          /usr/lib/libxnet.so \
          /usr/lib/libxnet.so.1 \
          /usr/lib/libzfs.so \
          /usr/lib/libzfs.so.1 \
+         /usr/lib/libzfs_core.so \
+         /usr/lib/libzfs_core.so.1 \
          /usr/lib/llib-ladm \
          /usr/lib/llib-ladm.ln \
          /usr/lib/llib-laio \
          /usr/lib/llib-laio.ln \
          /usr/lib/llib-lavl \
*** 1723,1732 ****
--- 1736,1747 ----
          /usr/lib/llib-luuid.ln \
          /usr/lib/llib-lxnet \
          /usr/lib/llib-lxnet.ln \
          /usr/lib/llib-lzfs \
          /usr/lib/llib-lzfs.ln \
+         /usr/lib/llib-lzfs_core \
+         /usr/lib/llib-lzfs_core.ln \
          /usr/lib/nss_compat.so.1 \
          /usr/lib/nss_dns.so.1 \
          /usr/lib/nss_files.so.1 \
          /usr/lib/nss_nis.so.1 \
          /usr/lib/nss_user.so.1 \
*** 1861,1870 ****
--- 1876,1887 ----
          /usr/lib/$(MACH64)/libw.so.1 \
          /usr/lib/$(MACH64)/libxnet.so \
          /usr/lib/$(MACH64)/libxnet.so.1 \
          /usr/lib/$(MACH64)/libzfs.so \
          /usr/lib/$(MACH64)/libzfs.so.1 \
+         /usr/lib/$(MACH64)/libzfs_core.so \
+         /usr/lib/$(MACH64)/libzfs_core.so.1 \
          /usr/lib/$(MACH64)/llib-ladm.ln \
          /usr/lib/$(MACH64)/llib-laio.ln \
          /usr/lib/$(MACH64)/llib-lavl.ln \
          /usr/lib/$(MACH64)/llib-lbsm.ln \
          /usr/lib/$(MACH64)/llib-lc.ln \
*** 1907,1916 ****
--- 1924,1934 ----
          /usr/lib/$(MACH64)/llib-ltsol.ln \
          /usr/lib/$(MACH64)/llib-lumem.ln \
          /usr/lib/$(MACH64)/llib-luuid.ln \
          /usr/lib/$(MACH64)/llib-lxnet.ln \
          /usr/lib/$(MACH64)/llib-lzfs.ln \
+         /usr/lib/$(MACH64)/llib-lzfs_core.ln \
          /usr/lib/$(MACH64)/nss_compat.so.1 \
          /usr/lib/$(MACH64)/nss_dns.so.1 \
          /usr/lib/$(MACH64)/nss_files.so.1 \
          /usr/lib/$(MACH64)/nss_nis.so.1 \
          /usr/lib/$(MACH64)/nss_user.so.1 \