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/mountd/mountd.c
          +++ new/usr/src/cmd/fs.d/nfs/mountd/mountd.c
↓ open down ↓ 13 lines elided ↑ open up ↑
  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  /*
  23   23   * Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved.
  24      - * Copyright 2012 Joyent, Inc. All rights reserved.
  25   24   * Copyright (c) 2012, 2016 by Delphix. All rights reserved.
  26   25   * Copyright 2016 Nexenta Systems, Inc.  All rights reserved.
  27   26   */
  28   27  
  29   28  /*      Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T     */
  30   29  /*        All Rights Reserved   */
  31   30  
  32   31  /*
  33   32   * Portions of this source code were derived from Berkeley 4.3 BSD
  34   33   * under license from the Regents of the University of California.
↓ open down ↓ 444 lines elided ↑ open up ↑
 479  478           */
 480  479          can_do_mlp = priv_ineffect(PRIV_NET_BINDMLP);
 481  480          if (__init_daemon_priv(PU_RESETGROUPS|PU_CLEARLIMITSET, -1, -1,
 482  481              PRIV_SYS_NFS, PRIV_PROC_AUDIT, PRIV_FILE_DAC_SEARCH,
 483  482              PRIV_NET_PRIVADDR,
 484  483              can_do_mlp ? PRIV_NET_BINDMLP : NULL, NULL) == -1) {
 485  484                  (void) fprintf(stderr,
 486  485                      "%s: must be run with sufficient privileges\n",
 487  486                      argv[0]);
 488  487                  exit(1);
 489      -        }
 490      -
 491      -        /* Mountd cannot run in a non-global zone. */
 492      -        if (getzoneid() != GLOBAL_ZONEID) {
 493      -                (void) fprintf(stderr, "%s: can only run in the global zone\n",
 494      -                    argv[0]);
 495      -                exit(1);
 496  488          }
 497  489  
 498  490          if (getrlimit(RLIMIT_NOFILE, &rl) != 0) {
 499  491                  syslog(LOG_ERR, "getrlimit failed");
 500  492          } else {
 501  493                  rl.rlim_cur = rl.rlim_max;
 502  494                  if (setrlimit(RLIMIT_NOFILE, &rl) != 0)
 503  495                          syslog(LOG_ERR, "setrlimit failed");
 504  496          }
 505  497  
↓ open down ↓ 2852 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX