Print this page
NEX-13644 File access audit logging
Reviewed by: Gordon Ross <gordon.ross@nexenta.com>
Reviewed by: Roman Strashkin <roman.strashkin@nexenta.com>
Reviewed by: Saso Kiselkov <saso.kiselkov@nexenta.com>
Reviewed by: Rick McNeal <rick.mcneal@nexenta.com>
Reviewed by: Yuri Pankov <yuri.pankov@nexenta.com>
NEX-17589 Get "too high" smbd error when copy big file to cifs share (redo)
Reviewed by: Matt Barden <matt.barden@nexenta.com>
Reviewed by: Evan Layton <evan.layton@nexenta.com>
NEX-13818 Support for Microsemi SmartPQI HBA's is required
Reviewed by: Rob Gittins <rob.gittins@nexenta.com>
Reviewed by: Yuri Pankov <yuri.pankov@nexenta.com>
NEX-14666 Need to provide SMB 2.1 Client
NEX-17187 panic in smbfs_acl_store
NEX-17231 smbfs create xattr files finds wrong file
NEX-17224 smbfs lookup EINVAL should be ENOENT
NEX-17260 SMB1 client fails to list directory after NEX-14666
Reviewed by: Evan Layton <evan.layton@nexenta.com>
Reviewed by: Matt Barden <matt.barden@nexenta.com>
Reviewed by: Rick McNeal <rick.mcneal@nexenta.com>
Reviewed by: Saso Kiselkov <saso.kiselkov@nexenta.com>
Reviewed by: Joyce McIntosh <joyce.mcintosh@nexenta.com>
and: (cleanup)
NEX-16824 SMB client connection setup rework
NEX-17232 SMB client reconnect failures
Reviewed by: Evan Layton <evan.layton@nexenta.com>
Reviewed by: Matt Barden <matt.barden@nexenta.com>
and: (improve debug)
NEX-16818 Add fksmbcl development tool
NEX-17264 SMB client test tp_smbutil_013 fails after NEX-14666
Reviewed by: Evan Layton <evan.layton@nexenta.com>
Reviewed by: Matt Barden <matt.barden@nexenta.com>
and: (fix ref leaks)
NEX-16819 loader UEFI support
Includes work by Toomas Soome <tsoome@me.com>
Upstream commits:
    loader: pxe receive cleanup
    9475 libefi: Do not return only if ReceiveFilter
    installboot: should support efi system partition
    8931 boot1.efi: scan all display modes rather than
    loader: spinconsole updates
    loader: gfx experiment to try GOP Blt() function.
    sha1 build test
    loader: add sha1 hash calculation
    common/sha1: update for loader build
    loader: biosdisk rework
    uts: 32-bit kernel FB needs mapping in low memory
    uts: add diag-device
    uts: boot console mirror with diag-device
    uts: enable very early console on ttya
    kmdb: add diag-device as input/output device
    uts: test VGA memory exclusion from mapping
    uts: clear boot mapping and protect boot pages test
    uts: add dboot map debug printf
    uts: need to release FB pages in release_bootstrap()
    uts: add screenmap ioctl
    uts: update sys/queue.h
    loader: add illumos uts/common to include path
    loader: tem/gfx font cleanup
    loader: vbe checks
    uts: gfx_private set KD_TEXT when KD_RESETTEXT is
    uts: gfx 8-bit update
    loader: gfx 8-bit fix
    loader: always set media size from partition.
    uts: MB2 support for 32-bit kernel
    loader: x86 should have tem 80x25
    uts: x86 should have tem 80x25
    uts: font update
    loader: font update
    uts: tem attributes
    loader: tem.c comment added
    uts: use font module
    loader: add font module
    loader: build rules for new font setup
    uts: gfx_private update for new font structure
    uts: early boot update for new font structure
    uts: font update
    uts: font build rules update for new fonts
    uts: tem update to new font structure
    loader: module.c needs to include tem_impl.h
    uts: gfx_private 8x16 font rework
    uts: make font_lookup public
    loader: font rework
    uts: font rework
    9259 libefi: efi_alloc_and_read should check for PMBR
    uts: tem utf-8 support
    loader: implement tem utf-8 support
    loader: tem should be able to display UTF-8
    7784 uts: console input should support utf-8
    7796 uts: ldterm default to utf-8
    uts: do not reset serial console
    uts: set up colors even if tem is not console
    uts: add type for early boot properties
    uts: gfx_private experiment with drm and vga
    uts: gfx_private should use setmode drm callback.
    uts: identify FB types and set up gfx_private based
    loader: replace gop and vesa with framebuffer
    uts: boot needs simple tem to support mdb
    uts: boot_keyboard should emit esc sequences for
    uts: gfx_private FB showuld be written by line
    kmdb: set terminal window size
    uts: gfx_private needs to keep track of early boot FB
    pnglite: move pnglite to usr/src/common
    loader: gfx_fb
    ficl-sys: add gfx primitives
    loader: add illumos.png logo
    ficl: add fb-putimage
    loader: add png support
    loader: add alpha blending for gfx_fb
    loader: use term-drawrect for menu frame
    ficl: add simple gfx words
    uts: provide fb_info via fbgattr dev_specific array.
    uts: gfx_private add alpha blending
    uts: update sys/ascii.h
    uts: tem OSC support (incomplete)
    uts: implement env module support and use data from
    uts: tem get colors from early boot data
    loader: use crc32 from libstand (libz)
    loader: optimize for size
    loader: pass tem info to the environment
    loader: import tem for loader console
    loader: UEFI loader needs to set ISADIR based on
    loader: need UEFI32 support
    8918 loader.efi: add vesa edid support
    uts: tem_safe_pix_clear_prom_output() should only
    uts: tem_safe_pix_clear_entire_screen() should use
    uts: tem_safe_check_first_time() should query cursor
    uts: tem implement cls callback & visual_io v4
    uts: gfx_vgatext use block cursor for vgatext
    uts: gfx_private implement cls callback & visual_io
    uts: gfx_private bitmap framebuffer implementation
    uts: early start frame buffer console support
    uts: font functions should check the input char
    uts: font rendering should support 16/24/32bit depths
    uts: use smallest font as fallback default.
    uts: update terminal dimensions based on selected
    7834 uts: vgatext should use gfx_private
    uts: add spacing property to 8859-1.bdf
    terminfo: add underline for sun-color
    terminfo: sun-color has 16 colors
    uts: add font load callback type
    loader: do not repeat int13 calls with error 0x20 and
    8905 loader: add skein/edonr support
    8904 common/crypto: make skein and edonr loader
Reviewed by: Yuri Pankov <yuri.pankov@nexenta.com>
Reviewed by: Sanjay Nadkarni <sanjay.nadkarni@nexenta.com>
Reviewed by: Evan Layton <evan.layton@nexenta.com>
Revert "NEX-16819 loader UEFI support"
This reverts commit ec06b9fc617b99234e538bf2e7e4d02a24993e0c.
Reverting due to failures in the zfs-tests and the sharefs-tests
NEX-16819 loader UEFI support
Includes work by Toomas Soome <tsoome@me.com>
Upstream commits:
    loader: pxe receive cleanup
    9475 libefi: Do not return only if ReceiveFilter
    installboot: should support efi system partition
    8931 boot1.efi: scan all display modes rather than
    loader: spinconsole updates
    loader: gfx experiment to try GOP Blt() function.
    sha1 build test
    loader: add sha1 hash calculation
    common/sha1: update for loader build
    loader: biosdisk rework
    uts: 32-bit kernel FB needs mapping in low memory
    uts: add diag-device
    uts: boot console mirror with diag-device
    uts: enable very early console on ttya
    kmdb: add diag-device as input/output device
    uts: test VGA memory exclusion from mapping
    uts: clear boot mapping and protect boot pages test
    uts: add dboot map debug printf
    uts: need to release FB pages in release_bootstrap()
    uts: add screenmap ioctl
    uts: update sys/queue.h
    loader: add illumos uts/common to include path
    loader: tem/gfx font cleanup
    loader: vbe checks
    uts: gfx_private set KD_TEXT when KD_RESETTEXT is
    uts: gfx 8-bit update
    loader: gfx 8-bit fix
    loader: always set media size from partition.
    uts: MB2 support for 32-bit kernel
    loader: x86 should have tem 80x25
    uts: x86 should have tem 80x25
    uts: font update
    loader: font update
    uts: tem attributes
    loader: tem.c comment added
    uts: use font module
    loader: add font module
    loader: build rules for new font setup
    uts: gfx_private update for new font structure
    uts: early boot update for new font structure
    uts: font update
    uts: font build rules update for new fonts
    uts: tem update to new font structure
    loader: module.c needs to include tem_impl.h
    uts: gfx_private 8x16 font rework
    uts: make font_lookup public
    loader: font rework
    uts: font rework
    libefi: efi_alloc_and_read should check for PMBR
    uts: tem utf-8 support
    loader: implement tem utf-8 support
    loader: tem should be able to display UTF-8
    7784 uts: console input should support utf-8
    7796 uts: ldterm default to utf-8
    uts: do not reset serial console
    uts: set up colors even if tem is not console
    uts: add type for early boot properties
    uts: gfx_private experiment with drm and vga
    uts: gfx_private should use setmode drm callback.
    uts: identify FB types and set up gfx_private based
    loader: replace gop and vesa with framebuffer
    uts: boot needs simple tem to support mdb
    uts: boot_keyboard should emit esc sequences for
    uts: gfx_private FB showuld be written by line
    kmdb: set terminal window size
    uts: gfx_private needs to keep track of early boot FB
    pnglite: move pnglite to usr/src/common
    loader: gfx_fb
    ficl-sys: add gfx primitives
    loader: add illumos.png logo
    ficl: add fb-putimage
    loader: add png support
    loader: add alpha blending for gfx_fb
    loader: use term-drawrect for menu frame
    ficl: add simple gfx words
    uts: provide fb_info via fbgattr dev_specific array.
    uts: gfx_private add alpha blending
    uts: update sys/ascii.h
    uts: tem OSC support (incomplete)
    uts: implement env module support and use data from
    uts: tem get colors from early boot data
    loader: use crc32 from libstand (libz)
    loader: optimize for size
    loader: pass tem info to the environment
    loader: import tem for loader console
    loader: UEFI loader needs to set ISADIR based on
    loader: need UEFI32 support
    8918 loader.efi: add vesa edid support
    uts: tem_safe_pix_clear_prom_output() should only
    uts: tem_safe_pix_clear_entire_screen() should use
    uts: tem_safe_check_first_time() should query cursor
    uts: tem implement cls callback & visual_io v4
    uts: gfx_vgatext use block cursor for vgatext
    uts: gfx_private implement cls callback & visual_io
    uts: gfx_private bitmap framebuffer implementation
    uts: early start frame buffer console support
    uts: font functions should check the input char
    uts: font rendering should support 16/24/32bit depths
    uts: use smallest font as fallback default.
    uts: update terminal dimensions based on selected
    7834 uts: vgatext should use gfx_private
    uts: add spacing property to 8859-1.bdf
    terminfo: add underline for sun-color
    terminfo: sun-color has 16 colors
    uts: add font load callback type
    loader: do not repeat int13 calls with error 0x20 and
    8905 loader: add skein/edonr support
    8904 common/crypto: make skein and edonr loader
Reviewed by: Yuri Pankov <yuri.pankov@nexenta.com>
Reviewed by: Sanjay Nadkarni <sanjay.nadkarni@nexenta.com>
Reviewed by: Evan Layton <evan.layton@nexenta.com>
NEX-16480 Want support for QLogic QL41000/45000 series devices
Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: Yuri Pankov <yuri.pankov@nexenta.com>
Reviewed by: Dan Fields <dan.fields@nexenta.com>
Reviewed by: Rick McNeal <rick.mcneal@nexenta.com>
Revert "NEX-16480 Want support for QLogic QL41000/45000 series devices"
This reverts commit ffd53b7544b2ef6b78185e7baffda5e09f3bc0cf.
Broke 5.2 build
NEX-16480 Want support for QLogic QL41000/45000 series devices
Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: Yuri Pankov <yuri.pankov@nexenta.com>
Reviewed by: Dan Fields <dan.fields@nexenta.com>
Reviewed by: Rick McNeal <rick.mcneal@nexenta.com>
NEX-9808 SMB3 persistent handles
Reviewed by: Matt Barden <matt.barden@nexenta.com>
Reviewed by: Evan Layton <evan.layton@nexenta.com>
NEX-15578 SMB2 durable handle redesign
Reviewed by: Matt Barden <matt.barden@nexenta.com>
Reviewed by: Evan Layton <evan.layton@nexenta.com>
NEX-5665 SMB2 oplock leases
Reviewed by: Matt Barden <matt.barden@nexenta.com>
Reviewed by: Evan Layton <evan.layton@nexenta.com>
Reviewed by: Roman Strashkin <roman.strashkin@nexenta.com>
NEX-9808 SMB3 persistent handles
Reviewed by: Matt Barden <matt.barden@nexenta.com>
Reviewed by: Evan Layton <evan.layton@nexenta.com>
NEX-15578 SMB2 durable handle redesign
Reviewed by: Matt Barden <matt.barden@nexenta.com>
Reviewed by: Evan Layton <evan.layton@nexenta.com>
NEX-5665 SMB2 oplock leases
Reviewed by: Matt Barden <matt.barden@nexenta.com>
Reviewed by: Evan Layton <evan.layton@nexenta.com>
Reviewed by: Roman Strashkin <roman.strashkin@nexenta.com>
NEX-14571 remove isal support remnants
Reviewed by: Roman Strashkin <roman.strashkin@nexenta.com>
NEX-9864 Some SMB cancel races remain after NEX-5845
Revert (part of) "NEX-5845 rework SMB immediate cancel"
reverts (part of) commit 7a5da69f6d42b17ebcc95ca3d02925d07a01343e.
Reviewed by: Matt Barden <matt.barden@nexenta.com>
Reviewed by: Evan Layton <evan.layton@nexenta.com>
NEX-5273 SMB 3 Encryption
Reviewed by: Gordon Ross <gordon.ross@nexenta.com>
Reviewed by: Evan Layton <evan.layton@nexenta.com>
Reviewed by: Roman Strashkin <roman.strashkin@nexenta.com>
NEX-1704 Clustered NFSv4 could cause I/O errors on clients after failover
Reviewed by:  Evan Layton <evan.layton@nexenta.com>
Reviewed by: Rob Gittins <rob.gittins@nexenta.com>
Reviewed by: Sanjay Nadkarni <sanjay.nadkarni@nexenta.com>
Reviewed by: Alek Pinchuk <alek.pinchuk@nexenta.com>
NEX-6778 NFS kstats leak and cause system to hang
Revert "NEX-4261 Per-client NFS server IOPS, bandwidth, and latency kstats"
This reverts commit 586c3ab1927647487f01c337ddc011c642575a52.
Revert "NEX-5354 Aggregated IOPS, bandwidth, and latency kstats for NFS server"
This reverts commit c91d7614da8618ef48018102b077f60ecbbac8c2.
Revert "NEX-5667 nfssrv_stats_flags does not work for aggregated kstats"
This reverts commit 3dcf42618be7dd5f408c327f429c81e07ca08e74.
Revert "NEX-5750 Time values for aggregated NFS server kstats should be normalized"
This reverts commit 1f4d4f901153b0191027969fa4a8064f9d3b9ee1.
Revert "NEX-5942 Panic in rfs4_minorvers_mismatch() with NFSv4.1 client"
This reverts commit 40766417094a162f5e4cc8786c0fa0a7e5871cd9.
Revert "NEX-5752 NFS server: namespace collision in kstats"
This reverts commit ae81e668db86050da8e483264acb0cce0444a132.
Reviewed by: Rob Gittins <rob.gittins@nexenta.com>
Reviewed by: Yuri Pankov <yuri.pankov@nexenta.com>
NEX-5664 Offload Data Transfer (ODX) support for Hyper-V
Reviewed by: Evan Layton <evan.layton@nexenta.com>
Reviewed by: Kevin Crowe <kevin.crowe@nexenta.com>
Reviewed by: Matt Barden <matt.barden@nexenta.com>
NEX-6276 SMB sparse file support
Reviewed by: Kevin Crowe <kevin.crowe@nexenta.com>
Reviewed by: Matt Barden <matt.barden@nexenta.com>
Reviewed by: Evan Layton <evan.layton@nexenta.com>
NEX-5844 want SMB2 ioctl FSCTL_SRV_COPYCHUNK
NEX-6124 smb_fsop_read/write should allow file != sr->fid_ofile
NEX-6125 smbtorture invalid response with smb2.ioctl
Reviewed by: Evan Layton <evan.layton@nexenta.com>
Reviewed by: Matt Barden <matt.barden@nexenta.com>
NEX-5795 Rename 'wrc' as 'wbc' in the source and in the tech docs
Reviewed by: Alex Aizman <alex.aizman@nexenta.com>
Reviewed by: Sanjay Nadkarni <sanjay.nadkarni@nexenta.com>
Reviewed by: Alek Pinchuk <alek.pinchuk@nexenta.com>
NEX-5717 import QLogic 16G FC drivers
Reviewed by: Steve Peng <steve.peng@nexenta.com>
Reviewed by: Josef 'Jeff' Sipek <josef.sipek@nexenta.com>
Reviewed by: Yuri Pankov <yuri.pankov@nexenta.com>
NEX-5272 KRRP: replicate snapshot properties
Reviewed by: Sanjay Nadkarni <sanjay.nadkarni@nexenta.com>
Reviewed by: Alexey Komarov <alexey.komarov@nexenta.com>
Reviewed by: Alex Aizman <alex.aizman@nexenta.com>
NEX-4261 Per-client NFS server IOPS, bandwidth, and latency kstats
Reviewed by: Kevin Crowe <kevin.crowe@nexenta.com>
Reviewed by: Roman Strashkin <roman.strashkin@nexenta.com>
NEX-5177 backport illumos 6345 remove xhat support
Reviewed by: Kevin Crowe <kevin.crowe@nexenta.com>
6345 remove xhat support
Reviewed by: Dan McDonald <danmcd@omniti.com>
Reviewed by: Garrett D'Amore <garrett@damore.org>
Approved by: Hans Rosenfeld <rosenfeld@grumpf.hope-2000.org>
NEX-3733 Want SMB2 Apple extensions
Reviewed by: Kevin Crowe <kevin.crowe@nexenta.com>
Reviewed by: Matt Barden <Matt.Barden@nexenta.com>
4185 add new cryptographic checksums to ZFS: SHA-512, Skein, Edon-R (fix studio build)
4185 add new cryptographic checksums to ZFS: SHA-512, Skein, Edon-R
Reviewed by: George Wilson <george.wilson@delphix.com>
Reviewed by: Prakash Surya <prakash.surya@delphix.com>
Reviewed by: Saso Kiselkov <saso.kiselkov@nexenta.com>
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Approved by: Garrett D'Amore <garrett@damore.org>
NEX-4582 update wrc test cases for allow to use write back cache per tree of datasets
Reviewed by: Steve Peng <steve.peng@nexenta.com>
Reviewed by: Alex Aizman <alex.aizman@nexenta.com>
5960 zfs recv should prefetch indirect blocks
5925 zfs receive -o origin=
Reviewed by: Prakash Surya <prakash.surya@delphix.com>
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
NEX-4483 backport new bnxe driver from illumos
5019 want open source bnxe
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Approved by: Dan McDonald <danmcd@omniti.com>
NEX-2182 need driver for Intel NVM Express (nvme) (preview)
Reviewed by: Dan Fields <dan.fields@nexenta.com>
NEX-4044 remove sha1crc32 in preparation with upstream merge of edon-r and skien
Reviewed by: Saso Kiselkov <saso.kiselkov@nexenta.com>
Reviewed by: Alek Pinchuk <alek@nexenta.com>
Conflicts:
        usr/src/uts/common/fs/zfs/sys/zio_checksum.h
NEX-3728 SMB1 signing should use KCF like SMB2/3
Reviewed by: Matt Barden <matt.barden@nexenta.com>
Reviewed by: Dan Fields <dan.fields@nexenta.com>
NEX-3610 CLONE NEX-3591 SMB3 signing
Reviewed by: Gordon Ross <gwr@nexenta.com>
Reviewed by: Dan Fields <dan.fields@nexenta.com>
NEX-3558 KRRP Integration
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
NEX-3079 port illumos ARC improvements
NEX-1890 update oce from source provided by Emulex
4500 mptsas_hash_traverse() is unsafe, leads to missing devices
Reviewed by: Hans Rosenfeld <hans.rosenfeld@nexenta.com>
Approved by: Albert Lee <trisk@nexenta.com>
backout 4500 mptsas_hash_traverse() is unsafe, leads to missing devices
SMB-55 SMB2 signing
4500 mptsas_hash_traverse() is unsafe, leads to missing devices
Reviewed by: Hans Rosenfeld <hans.rosenfeld@nexenta.com>
Approved by: Albert Lee <trisk@nexenta.com>
SMB-11 SMB2 message parse & dispatch
SMB-12 SMB2 Negotiate Protocol
SMB-13 SMB2 Session Setup
SMB-14 SMB2 Logoff
SMB-15 SMB2 Tree Connect
SMB-16 SMB2 Tree Disconnect
SMB-17 SMB2 Create
SMB-18 SMB2 Close
SMB-19 SMB2 Flush
SMB-20 SMB2 Read
SMB-21 SMB2 Write
SMB-22 SMB2 Lock/Unlock
SMB-23 SMB2 Ioctl
SMB-24 SMB2 Cancel
SMB-25 SMB2 Echo
SMB-26 SMB2 Query Dir
SMB-27 SMB2 Change Notify
SMB-28 SMB2 Query Info
SMB-29 SMB2 Set Info
SMB-30 SMB2 Oplocks
SMB-53 SMB2 Create Context options
(SMB2 code review cleanup 1, 2, 3)
OS-80 support for vdev and CoS properties for the new I/O scheduler
OS-95 lint warning introduced by OS-61
SMB-69 read-raw, write-raw are dead code
SMB-56 extended security NTLMSSP, inbound
SMB-39 Use AF_UNIX pipes for RPC
SMB-50 User-mode SMB server
 Includes work by these authors:
 Thomas Keiser <thomas.keiser@nexenta.com>
 Albert Lee <trisk@nexenta.com>
OS-69 Open source VAAI
Moved closed ZFS files to open repo, changed Makefiles accordingly
Removed unneeded weak symbols
OS-13 sTec S112x support.
Reviewed by: Marcel Telka <marcel.telka@nexenta.com>
Reviewed by: Kevin Crowe <kevin.crowe@nexenta.com>
Reviewed by: Albert Lee <trisk@nexenta.com>
port of illumos-3644
    3644 Add virtio-net support into the Illumos
    Reviewed by: Alexey Zaytsev <alexey.zaytsev@gmail.com>
    Reviewed by: Yuri Pankov <yuri.pankov@nexenta.com>
    Reviewed by: David Hoppner <0xffea@gmail.com>
port of illumos-1147
    1147 integrate the virtio-block driver
    Reviewed by: Dmitry Yusupov <Dmitry.Yusupov@nexenta.com>
    Reviewed by: Gordon Ross <gordon.w.ross@gmail.com>
    Approved by: Garrett D'Amore <garrett@damore.org>
port of illumos-1562
    1562 Integrate the virtio core module
    Reviewed by: Dmitry Yusupov <Dmitry.Yusupov@nexenta.com>
    Reviewed by: Gordon Ross <gordon.w.ross@gmail.com>
    Approved by: Garrett D'Amore <garrett@damore.org>
re #11944 rb3746 need workaround for QEMU bug that induces bad e1000g checksums
re #11242 rb3560 LSI 2208 and 3108 support for mr_sas
Adding AoE support to nza-kernel
8226 nza-kernel needs to be buildable by itself
Re #6790 backspace should perform delete on console
VAAI (XXX ATS support for COMSTAR, YYY Block-copy support for COMSTAR)
        
*** 21,35 ****
  
  #
  # Copyright (c) 1991, 2010, Oracle and/or its affiliates. All rights reserved.
  # Copyright (c) 2011, 2014 by Delphix. All rights reserved.
  # Copyright (c) 2013 by Saso Kiselkov. All rights reserved.
- # Copyright 2015 Nexenta Systems, Inc.  All rights reserved.
  # Copyright 2016 Garrett D'Amore <garrett@damore.org>
  # Copyright (c) 2017, Joyent, Inc.
  # Copyright 2016 OmniTI Computer Consulting, Inc.  All rights reserved.
  # Copyright 2016 Hans Rosenfeld <rosenfeld@grumpf.hope-2000.org>
  #
  
  #
  # This Makefile defines all file modules for the directory uts/common
  # and its children. These are the source files which may be considered
--- 21,35 ----
  
  #
  # Copyright (c) 1991, 2010, Oracle and/or its affiliates. All rights reserved.
  # Copyright (c) 2011, 2014 by Delphix. All rights reserved.
  # Copyright (c) 2013 by Saso Kiselkov. All rights reserved.
  # Copyright 2016 Garrett D'Amore <garrett@damore.org>
  # Copyright (c) 2017, Joyent, Inc.
  # Copyright 2016 OmniTI Computer Consulting, Inc.  All rights reserved.
  # Copyright 2016 Hans Rosenfeld <rosenfeld@grumpf.hope-2000.org>
+ # Copyright 2018 Nexenta Systems, Inc.  All rights reserved.
  #
  
  #
  # This Makefile defines all file modules for the directory uts/common
  # and its children. These are the source files which may be considered
*** 158,167 ****
--- 158,168 ----
                  devid_cache.o   \
                  devid_scsi.o    \
                  devid_smp.o     \
                  devpolicy.o     \
                  disp_lock.o     \
+                 dkioc_free_util.o \
                  dnlc.o          \
                  driver.o        \
                  dumpsubr.o      \
                  driver_lyr.o    \
                  dtrace_subr.o   \
*** 949,967 ****
                  emlxs_thread.o
  
  EMLXS_FW_OBJS +=        emlxs_fw.o
  
  OCE_OBJS +=     oce_buf.o oce_fm.o oce_gld.o oce_hw.o oce_intr.o oce_main.o \
!                 oce_mbx.o oce_mq.o oce_queue.o oce_rx.o oce_stat.o oce_tx.o \
!                 oce_utils.o
  
  FCT_OBJS += discovery.o fct.o
  
! QLT_OBJS += 2400.o 2500.o 8100.o qlt.o qlt_dma.o
  
  SRPT_OBJS += srpt_mod.o srpt_ch.o srpt_cm.o srpt_ioc.o srpt_stp.o
  
  FCOE_OBJS += fcoe.o fcoe_eth.o fcoe_fc.o
  
  FCOET_OBJS += fcoet.o fcoet_eth.o fcoet_fc.o
  
  FCOEI_OBJS += fcoei.o fcoei_eth.o fcoei_lv.o
--- 950,972 ----
                  emlxs_thread.o
  
  EMLXS_FW_OBJS +=        emlxs_fw.o
  
  OCE_OBJS +=     oce_buf.o oce_fm.o oce_gld.o oce_hw.o oce_intr.o oce_main.o \
!                 oce_mbx.o oce_mq.o oce_queue.o oce_ring.o oce_rx.o oce_stat.o \
!                 oce_tx.o oce_utils.o
  
  FCT_OBJS += discovery.o fct.o
  
! QLT_OBJS += 2400.o 2500.o 2700.o 8100.o 8300fc.o qlt.o qlt_dma.o
  
  SRPT_OBJS += srpt_mod.o srpt_ch.o srpt_cm.o srpt_ioc.o srpt_stp.o
  
+ AOE_OBJS += aoe.o
+ 
+ AOEBLK_OBJS += aoeblk.o
+ 
  FCOE_OBJS += fcoe.o fcoe_eth.o fcoe_fc.o
  
  FCOET_OBJS += fcoet.o fcoet_eth.o fcoet_fc.o
  
  FCOEI_OBJS += fcoei.o fcoei_eth.o fcoei_lv.o
*** 976,986 ****
  
  PPPT_OBJS +=    alua_ic_if.o pppt.o pppt_msg.o pppt_tgt.o
  
  STMF_OBJS += lun_map.o stmf.o
  
! STMF_SBD_OBJS += sbd.o sbd_scsi.o sbd_pgr.o sbd_zvol.o
  
  SYSMSG_OBJS +=  sysmsg.o
  
  SES_OBJS +=     ses.o ses_sen.o ses_safte.o ses_ses.o
  
--- 981,991 ----
  
  PPPT_OBJS +=    alua_ic_if.o pppt.o pppt_msg.o pppt_tgt.o
  
  STMF_OBJS += lun_map.o stmf.o
  
! STMF_SBD_OBJS += sbd.o sbd_scsi.o sbd_pgr.o sbd_zvol.o ats_copy_mgr.o
  
  SYSMSG_OBJS +=  sysmsg.o
  
  SES_OBJS +=     ses.o ses_sen.o ses_safte.o ses_ses.o
  
*** 1054,1078 ****
  
  FCTL_OBJS += fctl.o
  
  FP_OBJS += fp.o
  
! QLC_OBJS += ql_api.o ql_debug.o ql_hba_fru.o ql_init.o ql_iocb.o ql_ioctl.o \
!         ql_isr.o ql_mbx.o ql_nx.o ql_xioctl.o ql_fw_table.o
  
  QLC_FW_2200_OBJS += ql_fw_2200.o
  
  QLC_FW_2300_OBJS += ql_fw_2300.o
  
  QLC_FW_2400_OBJS += ql_fw_2400.o
  
  QLC_FW_2500_OBJS += ql_fw_2500.o
  
  QLC_FW_6322_OBJS += ql_fw_6322.o
  
  QLC_FW_8100_OBJS += ql_fw_8100.o
  
  QLGE_OBJS += qlge.o qlge_dbg.o qlge_flash.o qlge_fm.o qlge_gld.o qlge_mpi.o
  
  ZCONS_OBJS += zcons.o
  
  NV_SATA_OBJS += nv_sata.o
--- 1059,1087 ----
  
  FCTL_OBJS += fctl.o
  
  FP_OBJS += fp.o
  
! QLC_OBJS += ql_api.o ql_debug.o ql_fm.o ql_hba_fru.o ql_init.o ql_iocb.o \
!         ql_ioctl.o ql_isr.o ql_mbx.o ql_nx.o ql_xioctl.o ql_fw_table.o
  
  QLC_FW_2200_OBJS += ql_fw_2200.o
  
  QLC_FW_2300_OBJS += ql_fw_2300.o
  
  QLC_FW_2400_OBJS += ql_fw_2400.o
  
  QLC_FW_2500_OBJS += ql_fw_2500.o
  
+ QLC_FW_2700_OBJS += ql_fw_2700.o
+ 
  QLC_FW_6322_OBJS += ql_fw_6322.o
  
  QLC_FW_8100_OBJS += ql_fw_8100.o
  
+ QLC_FW_8301FC_OBJS += ql_fw_8301fc.o
+ 
  QLGE_OBJS += qlge.o qlge_dbg.o qlge_flash.o qlge_fm.o qlge_gld.o qlge_mpi.o
  
  ZCONS_OBJS += zcons.o
  
  NV_SATA_OBJS += nv_sata.o
*** 1167,1178 ****
--- 1176,1192 ----
                  nfs_acl_srv.o   nfs_auth.o      nfs_auth_xdr.o \
                  nfs_export.o    nfs_log.o       nfs_log_xdr.o \
                  nfs4_srv.o      nfs4_state.o    nfs4_srv_attr.o \
                  nfs4_srv_ns.o   nfs4_db.o       nfs4_srv_deleg.o \
                  nfs4_deleg_ops.o nfs4_srv_readdir.o nfs4_dispatch.o
+ #
+ # NFSv4 HA module
+ #
+ NFS_HA_OBJS += cl_bootstrap.o
  
  SMBSRV_SHARED_OBJS += \
+                 smb_cfg_util.o \
                  smb_door_legacy.o \
                  smb_inet.o \
                  smb_match.o \
                  smb_msgbuf.o \
                  smb_native.o \
*** 1188,1199 ****
--- 1202,1215 ----
  
  # See also: $SRC/lib/smbsrv/libfksmbsrv/Makefile.com
  SMBSRV_OBJS +=  $(SMBSRV_SHARED_OBJS)                   \
                  smb_acl.o                               \
                  smb_alloc.o                             \
+                 smb_audit.o                             \
                  smb_authenticate.o                      \
                  smb_close.o                             \
+                 smb_cmn_oplock.o                        \
                  smb_cmn_rename.o                        \
                  smb_cmn_setfile.o                       \
                  smb_common_open.o                       \
                  smb_common_transact.o                   \
                  smb_create.o                            \
*** 1250,1280 ****
                  smb_session.o                           \
                  smb_session_setup_andx.o                \
                  smb_set_fileinfo.o                      \
                  smb_sign_kcf.o                          \
                  smb_signing.o                           \
                  smb_thread.o                            \
                  smb_tree.o                              \
                  smb_trans2_create_directory.o           \
                  smb_trans2_dfs.o                        \
                  smb_trans2_find.o                       \
                  smb_tree_connect.o                      \
                  smb_unlock_byte_range.o                 \
                  smb_user.o                              \
-                 smb_vfs.o                               \
                  smb_vops.o                              \
                  smb_vss.o                               \
                  smb_write.o                             \
                  \
                  smb2_dispatch.o \
                  smb2_cancel.o \
                  smb2_change_notify.o \
                  smb2_close.o \
                  smb2_create.o \
                  smb2_echo.o \
                  smb2_flush.o \
                  smb2_ioctl.o \
                  smb2_lock.o \
                  smb2_logoff.o \
                  smb2_negotiate.o \
                  smb2_ofile.o \
                  smb2_oplock.o \
--- 1266,1303 ----
                  smb_session.o                           \
                  smb_session_setup_andx.o                \
                  smb_set_fileinfo.o                      \
                  smb_sign_kcf.o                          \
                  smb_signing.o                           \
+                 smb_srv_oplock.o                        \
                  smb_thread.o                            \
                  smb_tree.o                              \
                  smb_trans2_create_directory.o           \
                  smb_trans2_dfs.o                        \
                  smb_trans2_find.o                       \
                  smb_tree_connect.o                      \
                  smb_unlock_byte_range.o                 \
                  smb_user.o                              \
                  smb_vops.o                              \
                  smb_vss.o                               \
                  smb_write.o                             \
                  \
+                 smb2_aapl.o \
                  smb2_dispatch.o \
+                 smb2_durable.o \
                  smb2_cancel.o \
                  smb2_change_notify.o \
                  smb2_close.o \
                  smb2_create.o \
                  smb2_echo.o \
                  smb2_flush.o \
+                 smb2_fsctl_copychunk.o \
+                 smb2_fsctl_fs.o \
+                 smb2_fsctl_odx.o \
+                 smb2_fsctl_sparse.o \
                  smb2_ioctl.o \
+                 smb2_lease.o \
                  smb2_lock.o \
                  smb2_logoff.o \
                  smb2_negotiate.o \
                  smb2_ofile.o \
                  smb2_oplock.o \
*** 1292,1302 ****
                  smb2_setinfo_quota.o \
                  smb2_setinfo_sec.o \
                  smb2_signing.o \
                  smb2_tree_connect.o \
                  smb2_tree_disconn.o \
!                 smb2_write.o
  
  PCFS_OBJS +=    pc_alloc.o      pc_dir.o        pc_node.o       pc_subr.o \
                  pc_vfsops.o     pc_vnops.o
  
  PROC_OBJS +=    prcontrol.o     prioctl.o       prsubr.o        prusrio.o \
--- 1315,1328 ----
                  smb2_setinfo_quota.o \
                  smb2_setinfo_sec.o \
                  smb2_signing.o \
                  smb2_tree_connect.o \
                  smb2_tree_disconn.o \
!                 smb2_write.o \
!                 \
!                 smb3_encrypt.o \
!                 smb3_encrypt_kcf.o
  
  PCFS_OBJS +=    pc_alloc.o      pc_dir.o        pc_node.o       pc_subr.o \
                  pc_vfsops.o     pc_vnops.o
  
  PROC_OBJS +=    prcontrol.o     prioctl.o       prsubr.o        prusrio.o \
*** 1333,1347 ****
  VSCAN_OBJS +=   vscan_drv.o     vscan_svc.o vscan_door.o
  
  NSMB_OBJS +=    smb_conn.o      smb_dev.o       smb_iod.o       smb_pass.o \
                  smb_rq.o        smb_sign.o      smb_smb.o       smb_subrs.o \
                  smb_time.o      smb_tran.o      smb_trantcp.o   smb_usr.o \
!                 subr_mchain.o
  
  SMBFS_COMMON_OBJS += smbfs_ntacl.o
  SMBFS_OBJS +=   smbfs_vfsops.o  smbfs_vnops.o   smbfs_node.o    \
                  smbfs_acl.o     smbfs_client.o  smbfs_smb.o     \
                  smbfs_subr.o    smbfs_subr2.o   \
                  smbfs_rwlock.o  smbfs_xattr.o   \
                  $(SMBFS_COMMON_OBJS)
  
  BOOTFS_OBJS +=  bootfs_construct.o bootfs_vfsops.o bootfs_vnops.o
--- 1359,1375 ----
  VSCAN_OBJS +=   vscan_drv.o     vscan_svc.o vscan_door.o
  
  NSMB_OBJS +=    smb_conn.o      smb_dev.o       smb_iod.o       smb_pass.o \
                  smb_rq.o        smb_sign.o      smb_smb.o       smb_subrs.o \
                  smb_time.o      smb_tran.o      smb_trantcp.o   smb_usr.o \
!                 smb2_rq.o       smb2_sign.o     smb2_smb.o      subr_mchain.o \
!                 nsmb_sign_kcf.o
  
  SMBFS_COMMON_OBJS += smbfs_ntacl.o
  SMBFS_OBJS +=   smbfs_vfsops.o  smbfs_vnops.o   smbfs_node.o    \
                  smbfs_acl.o     smbfs_client.o  smbfs_smb.o     \
+                 smbfs_smb1.o    smbfs_smb2.o    \
                  smbfs_subr.o    smbfs_subr2.o   \
                  smbfs_rwlock.o  smbfs_xattr.o   \
                  $(SMBFS_COMMON_OBJS)
  
  BOOTFS_OBJS +=  bootfs_construct.o bootfs_vfsops.o bootfs_vnops.o
*** 1375,1398 ****
          llex.o                  \
          lparser.o
  
  ZFS_COMMON_OBJS +=              \
          abd.o                   \
-         aggsum.o                \
          arc.o                   \
          blkptr.o                \
          bplist.o                \
          bpobj.o                 \
          bptree.o                \
          bqueue.o                \
-         cityhash.o              \
          dbuf.o                  \
          ddt.o                   \
          ddt_zap.o               \
          dmu.o                   \
          dmu_diff.o              \
          dmu_send.o              \
          dmu_object.o            \
          dmu_objset.o            \
          dmu_traverse.o          \
          dmu_tx.o                \
          dnode.o                 \
--- 1403,1426 ----
          llex.o                  \
          lparser.o
  
  ZFS_COMMON_OBJS +=              \
          abd.o                   \
          arc.o                   \
+         autosnap.o              \
          blkptr.o                \
          bplist.o                \
          bpobj.o                 \
          bptree.o                \
          bqueue.o                \
          dbuf.o                  \
          ddt.o                   \
          ddt_zap.o               \
          dmu.o                   \
          dmu_diff.o              \
          dmu_send.o              \
+         dmu_krrp.o              \
          dmu_object.o            \
          dmu_objset.o            \
          dmu_traverse.o          \
          dmu_tx.o                \
          dnode.o                 \
*** 1433,1451 ****
          uberblock.o             \
          unique.o                \
          vdev.o                  \
          vdev_cache.o            \
          vdev_file.o             \
-         vdev_indirect.o         \
-         vdev_indirect_births.o  \
-         vdev_indirect_mapping.o \
          vdev_label.o            \
          vdev_mirror.o           \
          vdev_missing.o          \
          vdev_queue.o            \
          vdev_raidz.o            \
-         vdev_removal.o          \
          vdev_root.o             \
          zap.o                   \
          zap_leaf.o              \
          zap_micro.o             \
          zcp.o                   \
--- 1461,1475 ----
*** 1463,1484 ****
          zio.o                   \
          zio_checksum.o          \
          zio_compress.o          \
          zio_inject.o            \
          zle.o                   \
!         zrlock.o                \
!         zthr.o
  
  ZFS_SHARED_OBJS +=              \
          zfeature_common.o       \
          zfs_comutil.o           \
          zfs_deleg.o             \
          zfs_fletcher.o          \
          zfs_namecheck.o         \
          zfs_prop.o              \
          zpool_prop.o            \
!         zprop_common.o
  
  ZFS_OBJS +=                     \
          $(ZFS_COMMON_OBJS)      \
          $(ZFS_SHARED_OBJS)      \
          vdev_disk.o             \
--- 1487,1516 ----
          zio.o                   \
          zio_checksum.o          \
          zio_compress.o          \
          zio_inject.o            \
          zle.o                   \
!         zrlock.o
  
+ ZFS_COMMON_OBJS +=              \
+         cos.o                   \
+         spa_vdev_props.o        \
+         special.o               \
+         wbc.o
+ 
  ZFS_SHARED_OBJS +=              \
          zfeature_common.o       \
+         zfs_sendrecv.o          \
          zfs_comutil.o           \
          zfs_deleg.o             \
          zfs_fletcher.o          \
          zfs_namecheck.o         \
          zfs_prop.o              \
          zpool_prop.o            \
!         zprop_common.o          \
!         cos_prop.o              \
!         vdev_prop.o
  
  ZFS_OBJS +=                     \
          $(ZFS_COMMON_OBJS)      \
          $(ZFS_SHARED_OBJS)      \
          vdev_disk.o             \
*** 1554,1565 ****
  
  KLMOPS_OBJS +=  klmops.o
  
  TLIMOD_OBJS +=  tlimod.o        t_kalloc.o      t_kbind.o       t_kclose.o \
                  t_kconnect.o    t_kfree.o       t_kgtstate.o    t_kopen.o \
!                 t_krcvudat.o    t_ksndudat.o    t_kspoll.o      t_kunbind.o \
!                 t_kutil.o
  
  RLMOD_OBJS += rlmod.o
  
  TELMOD_OBJS += telmod.o
  
--- 1586,1597 ----
  
  KLMOPS_OBJS +=  klmops.o
  
  TLIMOD_OBJS +=  tlimod.o        t_kalloc.o      t_kbind.o       t_kclose.o \
                  t_kconnect.o    t_kfree.o       t_kgtstate.o    t_kopen.o \
!                 t_koptmgmt.o    t_krcvudat.o    t_ksndudat.o    t_kspoll.o \
!                 t_kunbind.o     t_kutil.o
  
  RLMOD_OBJS += rlmod.o
  
  TELMOD_OBJS += telmod.o
  
*** 1677,1690 ****
  TEM_OBJS += tem.o tem_safe.o
  
  #
  #       Font data for generated 8x16 font
  #
! VGATEXT_FONT    = 8x16
! VGATEXT_FONT_SRC= 8859-1
! VGATEXT_FONT_DIR= $(UTSBASE)/common/font
! FONT_OBJS += font.o 6x10.o 7x14.o 8x16.o 12x22.o
  
  KBTRANS_OBJS +=                         \
                  kbtrans.o               \
                  kbtrans_keytables.o     \
                  kbtrans_polled.o        \
--- 1709,1722 ----
  TEM_OBJS += tem.o tem_safe.o
  
  #
  #       Font data for generated 8x16 font
  #
! FONT    = 8x16
! FONT_SRC= ter-u16n
! FONT_DIR= $(SRC)/data/consfonts
! FONT_OBJS += font.o $(FONT).o
  
  KBTRANS_OBJS +=                         \
                  kbtrans.o               \
                  kbtrans_keytables.o     \
                  kbtrans_polled.o        \
*** 1921,1930 ****
--- 1953,1967 ----
  MXFE_OBJS += mxfe.o
  
  MPTSAS_OBJS += mptsas.o mptsas_hash.o mptsas_impl.o mptsas_init.o \
                  mptsas_raid.o mptsas_smhba.o
  
+ SMARTPQI_OBJS += smartpqi_main.o smartpqi_intr.o smartpqi_hba.o \
+                 smartpqi_util.o smartpqi_hw.o smartpqi_init.o \
+                 smartpqi_sis.o
+ 
+ 
  SFE_OBJS += sfe.o sfe_util.o
  
  BFE_OBJS += bfe.o
  
  BRIDGE_OBJS += bridge.o
*** 1942,1951 ****
--- 1979,1996 ----
  
  SKD_OBJS = skd.o
  
  NVME_OBJS = nvme.o
  
+ KRRP_SHARED_OBJS += krrp_error.o krrp_ioctl_common.o krrp_params.o
+ 
+ KRRP_OBJS += krrp.o krrp_svc.o krrp_ioctl.o krrp_server.o \
+                         krrp_session.o krrp_pdu.o krrp_dblk.o \
+                         krrp_protocol.o krrp_connection.o krrp_queue.o \
+                         krrp_stream.o krrp_stream_task.o krrp_autosnap.o\
+                         $(KRRP_SHARED_OBJS)
+ 
  #
  #       Build up defines and paths.
  #
  LINT_DEFS       += -Dunix
  
*** 2256,2260 ****
--- 2301,2317 ----
                  lm_sp.o                 \
                  lm_dcbx_mp.o            \
                  lm_sp_req_mgr.o         \
                  lm_stats.o              \
                  lm_util.o
+ 
+ #
+ # The QEDE_EN_OBJS list are general objects that are shared across
+ # multiple different operating systems. QEDE_OBJS are illumos-specific
+ # objects.
+ #
+ QEDE_OBJS += qede_cfg.o qede_dbg.o qede_fp.o qede_gld.o \
+              qede_kstat.o qede_main.o qede_misc.o qede_osal.o
+ QEDE_GEN_OBJS += ecore_hw.o ecore_cxt.o ecore_selftest.o ecore_init_ops.o \
+                   ecore_init_fw_funcs.o ecore_sp_commands.o ecore_dcbx.o \
+                   ecore_dbg_fw_funcs.o ecore_mcp.o ecore_spq.o ecore_phy.o \
+                   ecore_dev.o ecore_l2.o ecore_int.o