Print this page
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

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/sys/debug.h
          +++ new/usr/src/uts/common/sys/debug.h
↓ open down ↓ 20 lines elided ↑ open up ↑
  21   21  /*
  22   22   * Copyright 2014 Garrett D'Amore <garrett@damore.org>
  23   23   *
  24   24   * Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
  25   25   * Use is subject to license terms.
  26   26   */
  27   27  
  28   28  /*
  29   29   * Copyright (c) 2012, 2017 by Delphix. All rights reserved.
  30   30   * Copyright 2013 Saso Kiselkov. All rights reserved.
       31 + * Copyright 2015 Nexenta Systems, Inc.  All rights reserved.
  31   32   */
  32   33  
  33   34  /*      Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */
  34   35  /*        All Rights Reserved   */
  35   36  
  36   37  #ifndef _SYS_DEBUG_H
  37   38  #define _SYS_DEBUG_H
  38   39  
  39   40  #include <sys/isa_defs.h>
  40   41  #include <sys/types.h>
↓ open down ↓ 88 lines elided ↑ open up ↑
 129  130  #endif
 130  131  
 131  132  /*
 132  133   * Compile-time assertion. The condition 'x' must be constant.
 133  134   */
 134  135  #define CTASSERT(x)             _CTASSERT(x, __LINE__)
 135  136  #define _CTASSERT(x, y)         __CTASSERT(x, y)
 136  137  #define __CTASSERT(x, y) \
 137  138          typedef char __compile_time_assertion__ ## y [(x) ? 1 : -1] __unused
 138  139  
 139      -#ifdef  _KERNEL
      140 +#if defined(_KERNEL) || defined(_FAKE_KERNEL)
 140  141  
 141  142  extern void abort_sequence_enter(char *);
 142  143  extern void debug_enter(char *);
 143  144  
 144      -#endif  /* _KERNEL */
      145 +#endif  /* _KERNEL || _FAKE_KERNEL */
 145  146  
 146  147  #if defined(DEBUG) && !defined(__sun)
 147  148  /* CSTYLED */
 148  149  #define STATIC
 149  150  #else
 150  151  /* CSTYLED */
 151  152  #define STATIC static
 152  153  #endif
 153  154  
 154  155  #ifdef  __cplusplus
 155  156  }
 156  157  #endif
 157  158  
 158  159  #endif  /* _SYS_DEBUG_H */
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX