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

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/fs/nfs/nfs_sys.c
          +++ new/usr/src/uts/common/fs/nfs/nfs_sys.c
↓ open down ↓ 14 lines elided ↑ open up ↑
  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 2008 Sun Microsystems, Inc.  All rights reserved.
  24   24   * Use is subject to license terms.
  25      - * Copyright 2017 Joyent, Inc.
  26      - *
  27   25   */
  28   26  
  29   27  /*
  30   28   * Copyright (c) 1983,1984,1985,1986,1987,1988,1989  AT&T.
  31   29   * All rights reserved.
  32   30   */
  33   31  
  34   32  /*
       33 + * Copyright 2017 Joyent, Inc.
  35   34   * Copyright 2018 Nexenta Systems, Inc.
  36   35   */
  37   36  
  38   37  #include <sys/types.h>
  39   38  #include <rpc/types.h>
  40   39  #include <sys/systm.h>
  41   40  #include <sys/vfs.h>
  42   41  #include <sys/errno.h>
  43   42  #include <sys/cred.h>
  44   43  #include <sys/policy.h>
↓ open down ↓ 363 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX