Print this page
Revert "OS-871 zone stuck in shutting_down - waiting for kernel thread nfsauth_refresh_thread to terminate"
This reverts commit 887d2a84c612cea61b6ad544f54cf790cfb9de3e.

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/fs.d/nfs/nfsd/nfsd.c
          +++ new/usr/src/cmd/fs.d/nfs/nfsd/nfsd.c
↓ open down ↓ 12 lines elided ↑ open up ↑
  13   13   * When distributing Covered Code, include this CDDL HEADER in each
  14   14   * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  15   15   * If applicable, add the following below this CDDL HEADER, with the
  16   16   * fields enclosed by brackets "[]" replaced with your own identifying
  17   17   * information: Portions Copyright [yyyy] [name of copyright owner]
  18   18   *
  19   19   * CDDL HEADER END
  20   20   */
  21   21  /*
  22   22   * Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved.
  23      - * Copyright (c) 2012, Joyent, Inc. All rights reserved.
  24   23   */
  25   24  
  26   25  /*      Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T         */
  27   26  /*        All Rights Reserved   */
  28   27  
  29   28  /*
  30   29   * University Copyright- Copyright (c) 1982, 1986, 1988
  31   30   * The Regents of the University of California
  32   31   * All Rights Reserved
  33   32   *
↓ open down ↓ 135 lines elided ↑ open up ↑
 169  168          svcsetprio();
 170  169  
 171  170          can_do_mlp = priv_ineffect(PRIV_NET_BINDMLP);
 172  171          if (__init_daemon_priv(PU_RESETGROUPS|PU_CLEARLIMITSET,
 173  172              DAEMON_UID, DAEMON_GID, PRIV_SYS_NFS,
 174  173              can_do_mlp ? PRIV_NET_BINDMLP : NULL, NULL) == -1) {
 175  174                  (void) fprintf(stderr, "%s should be run with"
 176  175                      " sufficient privileges\n", av[0]);
 177  176                  exit(1);
 178  177          }
 179      -
 180      -        /* Nfsd cannot run in a non-global zone. */
 181      -        if (getzoneid() != GLOBAL_ZONEID) {
 182      -                (void) fprintf(stderr, "%s: can only run in the global zone\n",
 183      -                    av[0]);
 184      -                exit(1);
 185      -        }
 186  178  
 187  179          (void) enable_extended_FILE_stdio(-1, -1);
 188  180  
 189  181          /*
 190  182           * Read in the values from SMF first before we check
 191  183           * command line options so the options override SMF values.
 192  184           */
 193  185          bufsz = PATH_MAX;
 194  186          ret = nfs_smf_get_prop("max_connections", value, DEFAULT_INSTANCE,
 195  187              SCF_TYPE_INTEGER, NFSD, &bufsz);
↓ open down ↓ 785 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX