From owner-svn-src-all@freebsd.org Thu Mar 24 20:06:53 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BA5BBADCBFD; Thu, 24 Mar 2016 20:06:53 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 68AF214CC; Thu, 24 Mar 2016 20:06:53 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2OK6qOd033831; Thu, 24 Mar 2016 20:06:52 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2OK6q1w033829; Thu, 24 Mar 2016 20:06:52 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201603242006.u2OK6q1w033829@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Thu, 24 Mar 2016 20:06:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r297241 - in head/sys: kern sys X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Mar 2016 20:06:53 -0000 Author: glebius Date: Thu Mar 24 20:06:52 2016 New Revision: 297241 URL: https://svnweb.freebsd.org/changeset/base/297241 Log: Space and style(9) corrections for recent mbuf changes. Modified: head/sys/kern/kern_mbuf.c head/sys/sys/mbuf.h Modified: head/sys/kern/kern_mbuf.c ============================================================================== --- head/sys/kern/kern_mbuf.c Thu Mar 24 20:00:07 2016 (r297240) +++ head/sys/kern/kern_mbuf.c Thu Mar 24 20:06:52 2016 (r297241) @@ -747,7 +747,7 @@ m_cljget(struct mbuf *m, int how, int si { uma_zone_t zone; void *retval; - + if (m != NULL) { KASSERT((m->m_flags & M_EXT) == 0, ("%s: mbuf %p has M_EXT", __func__, m)); @@ -939,8 +939,8 @@ m_extadd(struct mbuf *mb, caddr_t buf, u void m_freem(struct mbuf *mb) { - MBUF_PROBE1(m__freem, mb); + MBUF_PROBE1(m__freem, mb); while (mb != NULL) mb = m_free(mb); } Modified: head/sys/sys/mbuf.h ============================================================================== --- head/sys/sys/mbuf.h Thu Mar 24 20:00:07 2016 (r297240) +++ head/sys/sys/mbuf.h Thu Mar 24 20:06:52 2016 (r297241) @@ -51,11 +51,11 @@ SDT_PROBE1(sdt, , , probe, arg0) #define MBUF_PROBE2(probe, arg0, arg1) \ SDT_PROBE2(sdt, , , probe, arg0, arg1) -#define MBUF_PROBE3(probe, arg0, arg1, arg2) \ +#define MBUF_PROBE3(probe, arg0, arg1, arg2) \ SDT_PROBE3(sdt, , , probe, arg0, arg1, arg2) -#define MBUF_PROBE4(probe, arg0, arg1, arg2, arg3) \ +#define MBUF_PROBE4(probe, arg0, arg1, arg2, arg3) \ SDT_PROBE4(sdt, , , probe, arg0, arg1, arg2, arg3) -#define MBUF_PROBE5(probe, arg0, arg1, arg2, arg3, arg4) \ +#define MBUF_PROBE5(probe, arg0, arg1, arg2, arg3, arg4) \ SDT_PROBE5(sdt, , , probe, arg0, arg1, arg2, arg3, arg4) SDT_PROBE_DECLARE(sdt, , , m__init); @@ -690,7 +690,7 @@ m_getzone(int size) static __inline int m_init(struct mbuf *m, int how, short type, int flags) { - int error = 0; + int error; m->m_next = NULL; m->m_nextpkt = NULL; @@ -700,6 +700,8 @@ m_init(struct mbuf *m, int how, short ty m->m_type = type; if (flags & M_PKTHDR) error = m_pkthdr_init(m, how); + else + error = 0; MBUF_PROBE5(m__init, m, how, type, flags, error); return (error);