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-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-3541 Implement persistent L2ARC
Reviewed by: Alek Pinchuk <alek.pinchuk@nexenta.com>
Reviewed by: Josef Sipek <josef.sipek@nexenta.com>
Conflicts:
        usr/src/uts/common/fs/zfs/sys/spa.h

*** 26,35 ****
--- 26,36 ----
   */
  
  /*
   * Copyright (c) 2012, 2017 by Delphix. All rights reserved.
   * Copyright 2013 Saso Kiselkov. All rights reserved.
+  * Copyright 2015 Nexenta Systems, Inc.  All rights reserved.
   */
  
  /*      Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */
  /*        All Rights Reserved   */
  
*** 134,149 ****
  #define CTASSERT(x)             _CTASSERT(x, __LINE__)
  #define _CTASSERT(x, y)         __CTASSERT(x, y)
  #define __CTASSERT(x, y) \
          typedef char __compile_time_assertion__ ## y [(x) ? 1 : -1] __unused
  
! #ifdef  _KERNEL
  
  extern void abort_sequence_enter(char *);
  extern void debug_enter(char *);
  
! #endif  /* _KERNEL */
  
  #if defined(DEBUG) && !defined(__sun)
  /* CSTYLED */
  #define STATIC
  #else
--- 135,150 ----
  #define CTASSERT(x)             _CTASSERT(x, __LINE__)
  #define _CTASSERT(x, y)         __CTASSERT(x, y)
  #define __CTASSERT(x, y) \
          typedef char __compile_time_assertion__ ## y [(x) ? 1 : -1] __unused
  
! #if defined(_KERNEL) || defined(_FAKE_KERNEL)
  
  extern void abort_sequence_enter(char *);
  extern void debug_enter(char *);
  
! #endif  /* _KERNEL || _FAKE_KERNEL */
  
  #if defined(DEBUG) && !defined(__sun)
  /* CSTYLED */
  #define STATIC
  #else