Module Name: src
Committed By: christos
Date: Sun Oct 2 19:26:46 UTC 2016
Modified Files:
src/sys/kern: uipc_socket.c uipc_socket2.c
Log Message:
more MFREE -> m_free
To generate a diff of this commit:
cvs rdiff -u -r1.248 -r1.249 src/sys/kern/uipc_socket.c
cvs rdiff -u -r1.123 -r1.124 src/sys/kern/uipc_socket2.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/uipc_socket.c
diff -u src/sys/kern/uipc_socket.c:1.248 src/sys/kern/uipc_socket.c:1.249
--- src/sys/kern/uipc_socket.c:1.248 Fri Jun 10 09:27:15 2016
+++ src/sys/kern/uipc_socket.c Sun Oct 2 15:26:46 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_socket.c,v 1.248 2016/06/10 13:27:15 ozaki-r Exp $ */
+/* $NetBSD: uipc_socket.c,v 1.249 2016/10/02 19:26:46 christos Exp $ */
/*-
* Copyright (c) 2002, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.248 2016/06/10 13:27:15 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.249 2016/10/02 19:26:46 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -1324,8 +1324,7 @@ soreceive(struct socket *so, struct mbuf
m->m_next = NULL;
m = so->so_rcv.sb_mb;
} else {
- MFREE(m, so->so_rcv.sb_mb);
- m = so->so_rcv.sb_mb;
+ m = so->so_rcv.sb_mb = m_free(m);
}
sbsync(&so->so_rcv, nextrecord);
}
@@ -1349,8 +1348,7 @@ soreceive(struct socket *so, struct mbuf
m->m_next = 0;
m = so->so_rcv.sb_mb;
} else {
- MFREE(m, so->so_rcv.sb_mb);
- m = so->so_rcv.sb_mb;
+ m = so->so_rcv.sb_mb = m_free(m);
}
}
}
@@ -1505,8 +1503,7 @@ soreceive(struct socket *so, struct mbuf
so->so_rcv.sb_mb = m = m->m_next;
*mp = NULL;
} else {
- MFREE(m, so->so_rcv.sb_mb);
- m = so->so_rcv.sb_mb;
+ m = so->so_rcv.sb_mb = m_free(m);
}
/*
* If m != NULL, we also know that
Index: src/sys/kern/uipc_socket2.c
diff -u src/sys/kern/uipc_socket2.c:1.123 src/sys/kern/uipc_socket2.c:1.124
--- src/sys/kern/uipc_socket2.c:1.123 Mon May 23 09:54:34 2016
+++ src/sys/kern/uipc_socket2.c Sun Oct 2 15:26:46 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_socket2.c,v 1.123 2016/05/23 13:54:34 tls Exp $ */
+/* $NetBSD: uipc_socket2.c,v 1.124 2016/10/02 19:26:46 christos Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_socket2.c,v 1.123 2016/05/23 13:54:34 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_socket2.c,v 1.124 2016/10/02 19:26:46 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_mbuftrace.h"
@@ -1167,7 +1167,7 @@ bad:
sbfree(sb, np);
n0 = n->m_nextpkt; /* iterate at next prepended address */
- MFREE(n, np); /* free prepended address (not data) */
+ np = m_free(n); /* free prepended address (not data) */
}
return error;
}
@@ -1297,7 +1297,7 @@ sbflush(struct sockbuf *sb)
void
sbdrop(struct sockbuf *sb, int len)
{
- struct mbuf *m, *mn, *next;
+ struct mbuf *m, *next;
KASSERT(solocked(sb->sb_so));
@@ -1319,13 +1319,11 @@ sbdrop(struct sockbuf *sb, int len)
}
len -= m->m_len;
sbfree(sb, m);
- MFREE(m, mn);
- m = mn;
+ m = m_free(m);
}
while (m && m->m_len == 0) {
sbfree(sb, m);
- MFREE(m, mn);
- m = mn;
+ m = m_free(m);
}
if (m) {
sb->sb_mb = m;
@@ -1361,7 +1359,7 @@ sbdroprecord(struct sockbuf *sb)
sb->sb_mb = m->m_nextpkt;
do {
sbfree(sb, m);
- MFREE(m, mn);
+ mn = m_free(m);
} while ((m = mn) != NULL);
}
SB_EMPTY_FIXUP(sb);
