Print this page
Clean up merge problems with illumos#11083 (nfs-zone)

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/sys/zone.h
          +++ new/usr/src/uts/common/sys/zone.h
↓ open down ↓ 45 lines elided ↑ open up ↑
  46   46  #include <sys/pset.h>
  47   47  #include <sys/cred.h>
  48   48  #include <sys/netstack.h>
  49   49  #include <sys/ksynch.h>
  50   50  #include <sys/socket_impl.h>
  51   51  #include <sys/secflags.h>
  52   52  #include <sys/cpu_uarray.h>
  53   53  #include <sys/nvpair.h>
  54   54  #include <sys/list.h>
  55   55  #include <sys/loadavg.h>
       56 +#include <sys/vnode.h>
  56   57  #endif  /* _KERNEL */
  57   58  
  58   59  #ifdef  __cplusplus
  59   60  extern "C" {
  60   61  #endif
  61   62  
  62   63  /*
  63   64   * NOTE
  64   65   *
  65   66   * The contents of this file are private to the implementation of
↓ open down ↓ 876 lines elided ↑ open up ↑
 942  943   */
 943  944  #define ZONE_ROOTVP()   (curzone->zone_rootvp)
 944  945  
 945  946  /*
 946  947   * Since a zone's root isn't necessarily an actual filesystem boundary
 947  948   * (i.e. VROOT may not be set on zone->zone_rootvp) we need to not assume it.
 948  949   * This macro helps in checking if a vnode is the current zone's rootvp.
 949  950   * NOTE:  Using the VN_ prefix, even though it's defined here in zone.h.
 950  951   * NOTE2: See above warning about ZONE_ROOTVP().
 951  952   */
 952      -#define VN_IS_CURZONEROOT(vp)   (VN_CMP(vp, ZONE_ROOTVP()))
      953 +#define VN_IS_CURZONEROOT(vp)   (VN_CMP(vp, ZONE_ROOTVP()))
 953  954  
 954  955  /*
 955  956   * Zone-safe version of thread_create() to be used when the caller wants to
 956  957   * create a kernel thread to run within the current zone's context.
 957  958   */
 958  959  extern kthread_t *zthread_create(caddr_t, size_t, void (*)(), void *, size_t,
 959  960      pri_t);
 960  961  extern void zthread_exit(void);
 961  962  
 962  963  /*
↓ open down ↓ 94 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX