Print this page
8115 parallel zfs mount

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/sys/cmn_err.h
          +++ new/usr/src/uts/common/sys/cmn_err.h
↓ open down ↓ 21 lines elided ↑ open up ↑
  22   22  /*      Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */
  23   23  /*        All Rights Reserved   */
  24   24  
  25   25  
  26   26  /*
  27   27   * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
  28   28   * Use is subject to license terms.
  29   29   *
  30   30   * Copyright 2013 Nexenta Systems, Inc.  All rights reserved.
  31   31   * Copyright 2016 Joyent, Inc.
       32 + * Copyright 2017 RackTop Systems.
  32   33   */
  33   34  
  34   35  #ifndef _SYS_CMN_ERR_H
  35   36  #define _SYS_CMN_ERR_H
  36   37  
  37   38  #if !defined(_ASM) && (defined(_KERNEL) || defined(_FAKE_KERNEL))
  38   39  #include <sys/va_list.h>
  39   40  #endif
  40   41  
  41   42  #include <sys/dditypes.h>
  42   43  
       44 +#if !defined(_ASM) && defined(_FAKE_KERNEL)
       45 +#include <stdio.h>
       46 +#endif
       47 +
  43   48  #ifdef  __cplusplus
  44   49  extern "C" {
  45   50  #endif
  46   51  
  47   52  /* Common error handling severity levels */
  48   53  
  49   54  #define CE_CONT         0       /* continuation         */
  50   55  #define CE_NOTE         1       /* notice               */
  51   56  #define CE_WARN         2       /* warning              */
  52   57  #define CE_PANIC        3       /* panic                */
  53   58  #define CE_IGNORE       4       /* print nothing        */
  54   59  
  55   60  #if !defined(_ASM) && (defined(_KERNEL) || defined(_FAKE_KERNEL))
  56   61  
  57   62  /*PRINTFLIKE2*/
  58   63  extern void cmn_err(int, const char *, ...)
  59   64      __KPRINTFLIKE(2);
  60   65  
       66 +extern void vcmn_err(int, const char *, __va_list)
       67 +    __KVPRINTFLIKE(2);
       68 +
       69 +#ifndef _FAKE_KERNEL
       70 +/*
       71 + * The following functions are either absent from libfakekernel
       72 + * or have different prototypes from the versions in libc.
       73 + */
       74 +
  61   75  extern void vzcmn_err(zoneid_t, int, const char *, __va_list)
  62   76      __KVPRINTFLIKE(3);
  63   77  
  64   78  extern void dev_err(dev_info_t *, int, char *, ...)
  65   79      __KPRINTFLIKE(3);
  66   80  
  67   81  extern void vdev_err(dev_info_t *, int, const char *, __va_list)
  68   82      __KVPRINTFLIKE(3);
  69   83  
  70      -extern void vcmn_err(int, const char *, __va_list)
  71      -    __KVPRINTFLIKE(2);
  72      -
  73   84  /*PRINTFLIKE3*/
  74   85  extern void zcmn_err(zoneid_t, int, const char *, ...)
  75   86      __KPRINTFLIKE(3);
  76   87  
  77   88  /*PRINTFLIKE1*/
  78   89  extern void printf(const char *, ...)
  79   90      __KPRINTFLIKE(1);
  80   91  
  81   92  extern void vzprintf(zoneid_t, const char *, __va_list)
  82   93      __KVPRINTFLIKE(2);
↓ open down ↓ 16 lines elided ↑ open up ↑
  99  110  extern size_t snprintf(char *, size_t, const char *, ...)
 100  111      __KPRINTFLIKE(3);
 101  112  extern size_t vsnprintf(char *, size_t, const char *, __va_list)
 102  113      __KVPRINTFLIKE(3);
 103  114  /*PRINTFLIKE2*/
 104  115  extern char *sprintf(char *, const char *, ...)
 105  116      __KPRINTFLIKE(2);
 106  117  extern char *vsprintf(char *, const char *, __va_list)
 107  118      __KVPRINTFLIKE(2);
 108  119  
      120 +#endif /* !_FAKE_KERNEL */
      121 +
 109  122  /*PRINTFLIKE1*/
 110  123  extern void panic(const char *, ...)
 111  124      __KPRINTFLIKE(1) __NORETURN;
 112  125  
 113  126  extern void vpanic(const char *, __va_list)
 114  127      __KVPRINTFLIKE(1) __NORETURN;
 115  128  
 116  129  #endif /* !_ASM && _KERNEL ... */
 117  130  
 118  131  #ifdef  __cplusplus
 119  132  }
 120  133  #endif
 121  134  
 122  135  #endif  /* _SYS_CMN_ERR_H */
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX