Print this page
OS-4517 lxbrand convert bind to IKE (remove unused function)
OS-4517 lxbrand convert bind to IKE
OS-4505 lxbrand java fails to bind on ipv6 address
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
OS-3752 Increase IOV_MAX to at least 1024

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/fs/sockfs/socksubr.c
          +++ new/usr/src/uts/common/fs/sockfs/socksubr.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 2015, Joyent, Inc. All rights reserved.
  24   25   */
  25   26  
  26   27  #include <sys/types.h>
  27   28  #include <sys/t_lock.h>
  28   29  #include <sys/param.h>
  29   30  #include <sys/systm.h>
  30   31  #include <sys/buf.h>
  31   32  #include <sys/conf.h>
  32   33  #include <sys/cred.h>
  33   34  #include <sys/kmem.h>
↓ open down ↓ 395 lines elided ↑ open up ↑
 429  430          return ((void *)ptr1);
 430  431  }
 431  432  
 432  433  /*
 433  434   * Return the AF_UNIX underlying filesystem vnode matching a given name.
 434  435   * Makes sure the sending and the destination sonodes are compatible.
 435  436   * The vnode is returned held.
 436  437   *
 437  438   * The underlying filesystem VSOCK vnode has a v_stream pointer that
 438  439   * references the actual stream head (hence indirectly the actual sonode).
      440 + *
      441 + * This function is non-static so it can be used by brand emulation.
 439  442   */
 440      -static int
      443 +int
 441  444  so_ux_lookup(struct sonode *so, struct sockaddr_un *soun, int checkaccess,
 442      -                vnode_t **vpp)
      445 +    vnode_t **vpp)
 443  446  {
 444  447          vnode_t         *vp;    /* Underlying filesystem vnode */
 445  448          vnode_t         *rvp;   /* real vnode */
 446  449          vnode_t         *svp;   /* sockfs vnode */
 447  450          struct sonode   *so2;
 448  451          int             error;
 449  452  
 450  453          dprintso(so, 1, ("so_ux_lookup(%p) name <%s>\n", (void *)so,
 451  454              soun->sun_path));
 452  455  
↓ open down ↓ 1419 lines elided ↑ open up ↑
1872 1875          }
1873 1876  
1874 1877          ksp->ks_ndata = ns;
1875 1878          return (0);
1876 1879  }
1877 1880  
1878 1881  ssize_t
1879 1882  soreadfile(file_t *fp, uchar_t *buf, u_offset_t fileoff, int *err, size_t size)
1880 1883  {
1881 1884          struct uio auio;
1882      -        struct iovec aiov[MSG_MAXIOVLEN];
     1885 +        struct iovec aiov[1];
1883 1886          register vnode_t *vp;
1884 1887          int ioflag, rwflag;
1885 1888          ssize_t cnt;
1886 1889          int error = 0;
1887 1890          int iovcnt = 0;
1888 1891          short fflag;
1889 1892  
1890 1893          vp = fp->f_vnode;
1891 1894          fflag = fp->f_flag;
1892 1895  
↓ open down ↓ 57 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX