[BACK]Return to uipc_mbuf.c CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / src / sys / kern

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /src/sys/kern/uipc_mbuf.c between version 1.194 and 1.195

version 1.194, 2018/04/26 07:46:24 version 1.195, 2018/04/26 08:13:30
Line 102  static void sysctl_kern_mbuf_setup(void)
Line 102  static void sysctl_kern_mbuf_setup(void)
   
 static struct sysctllog *mbuf_sysctllog;  static struct sysctllog *mbuf_sysctllog;
   
 static struct mbuf *m_copym0(struct mbuf *, int, int, int, bool);  static struct mbuf *m_copy_internal(struct mbuf *, int, int, int, bool);
 static struct mbuf *m_split0(struct mbuf *, int, int, bool);  static struct mbuf *m_split_internal(struct mbuf *, int, int, bool);
 static int m_copyback0(struct mbuf **, int, int, const void *, int, int);  static int m_copyback0(struct mbuf **, int, int, const void *, int, int);
   
 /* flags for m_copyback0 */  /* flags for m_copyback0 */
Line 717  m_prepend(struct mbuf *m, int len, int h
Line 717  m_prepend(struct mbuf *m, int len, int h
  * The wait parameter is a choice of M_WAIT/M_DONTWAIT from caller.   * The wait parameter is a choice of M_WAIT/M_DONTWAIT from caller.
  */   */
 struct mbuf *  struct mbuf *
 m_copym(struct mbuf *m, int off0, int len, int wait)  m_copym(struct mbuf *m, int off, int len, int wait)
 {  {
           /* Shallow copy on M_EXT. */
         return m_copym0(m, off0, len, wait, false); /* shallow copy on M_EXT */          return m_copy_internal(m, off, len, wait, false);
 }  }
   
 struct mbuf *  struct mbuf *
 m_dup(struct mbuf *m, int off0, int len, int wait)  m_dup(struct mbuf *m, int off, int len, int wait)
 {  {
           /* Deep copy. */
         return m_copym0(m, off0, len, wait, true); /* deep copy */          return m_copy_internal(m, off, len, wait, true);
 }  }
   
 static inline int  static inline int
Line 737  m_copylen(int len, int copylen)
Line 737  m_copylen(int len, int copylen)
 }  }
   
 static struct mbuf *  static struct mbuf *
 m_copym0(struct mbuf *m, int off0, int len, int wait, bool deep)  m_copy_internal(struct mbuf *m, int off0, int len, int wait, bool deep)
 {  {
         struct mbuf *n, **np;          struct mbuf *n, **np;
         int off = off0;          int off = off0;
Line 1145  m_copyup(struct mbuf *n, int len, int ds
Line 1145  m_copyup(struct mbuf *n, int len, int ds
         return (NULL);          return (NULL);
 }  }
   
 /*  
  * Partition an mbuf chain in two pieces, returning the tail --  
  * all but the first len0 bytes.  In case of failure, it returns NULL and  
  * attempts to restore the chain to its original state.  
  */  
 struct mbuf *  struct mbuf *
 m_split(struct mbuf *m0, int len0, int wait)  m_split(struct mbuf *m0, int len, int wait)
 {  {
           return m_split_internal(m0, len, wait, true);
         return m_split0(m0, len0, wait, true);  
 }  }
   
 static struct mbuf *  static struct mbuf *
 m_split0(struct mbuf *m0, int len0, int wait, bool copyhdr)  m_split_internal(struct mbuf *m0, int len0, int wait, bool copyhdr)
 {  {
         struct mbuf *m, *n;          struct mbuf *m, *n;
         unsigned len = len0, remain, len_save;          unsigned len = len0, remain, len_save;
Line 1533  extend:
Line 1527  extend:
                          * a mbuf, split it first.                           * a mbuf, split it first.
                          */                           */
                         if (off > 0) {                          if (off > 0) {
                                 n = m_split0(m, off, how, false);                                  n = m_split_internal(m, off, how, false);
                                 if (n == NULL)                                  if (n == NULL)
                                         goto enobufs;                                          goto enobufs;
                                 m->m_next = n;                                  m->m_next = n;
Legend:
Removed from v.1.194  
changed lines
  Added in v.1.195
CVSweb <webmaster@jp.NetBSD.org>