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_auth.c
          +++ new/usr/src/uts/common/fs/nfs/nfs_auth.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) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
  24      - * Copyright (c) 2015 Joyent, Inc.  All rights reserved.
  25   24   * Copyright (c) 2015 by Delphix. All rights reserved.
  26   25   * Copyright (c) 2015 Joyent, Inc.  All rights reserved.
  27   26   * Copyright 2018 Nexenta Systems, Inc. All rights reserved.
  28   27   */
  29   28  
  30   29  #include <sys/param.h>
  31   30  #include <sys/errno.h>
  32   31  #include <sys/vfs.h>
  33   32  #include <sys/vnode.h>
  34   33  #include <sys/cred.h>
↓ open down ↓ 1581 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX