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

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/klm/nlm_impl.h
          +++ new/usr/src/uts/common/klm/nlm_impl.h
↓ open down ↓ 452 lines elided ↑ open up ↑
 453  453          kcondvar_t                      nlm_gc_sched_cv;        /* (z) */
 454  454          kcondvar_t                      nlm_gc_finish_cv;       /* (z) */
 455  455          struct nlm_nsm                  nlm_nsm;                /* (z) */
 456  456          avl_tree_t                      nlm_hosts_tree;         /* (z) */
 457  457          mod_hash_t                      *nlm_hosts_hash;        /* (z) */
 458  458          struct nlm_host_list            nlm_idle_hosts;         /* (z) */
 459  459          struct nlm_slock_list           nlm_slocks;             /* (z) */
 460  460          int                             cn_idle_tmo;            /* (z) */
 461  461          int                             grace_period;           /* (z) */
 462  462          int                             retrans_tmo;            /* (z) */
      463 +        boolean_t                       nlm_v4_only;            /* (z) */
 463  464          zoneid_t                        nlm_zoneid;             /* (c) */
 464  465          kmutex_t                        clean_lock;             /* (c) */
 465  466          TAILQ_ENTRY(nlm_globals)        nlm_link;               /* (g) */
 466  467  };
 467  468  TAILQ_HEAD(nlm_globals_list, nlm_globals);
 468  469  
 469  470  
 470  471  /*
 471  472   * This is what we pass as the "owner handle" for NLM_LOCK.
 472  473   * This lets us find the blocked lock in NLM_GRANTED.
↓ open down ↓ 172 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX