From owner-svn-src-all@FreeBSD.ORG Sun Sep 7 06:12:34 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6D939E84; Sun, 7 Sep 2014 06:12:34 +0000 (UTC) Received: from cyrus.watson.org (cyrus.watson.org [198.74.231.69]) by mx1.freebsd.org (Postfix) with ESMTP id 495AF1796; Sun, 7 Sep 2014 06:12:34 +0000 (UTC) Received: from aca80381.ipt.aol.com (unknown [123.63.148.51]) by cyrus.watson.org (Postfix) with ESMTPSA id F05C746B7F; Sun, 7 Sep 2014 02:12:30 -0400 (EDT) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 7.3 \(1878.6\)) Subject: Re: svn commit: r271174 - head/sys/sys From: "Robert N. M. Watson" In-Reply-To: <20140907055355.GK17059@FreeBSD.org> Date: Sun, 7 Sep 2014 11:42:24 +0530 Content-Transfer-Encoding: quoted-printable Message-Id: <68A880D5-01DD-4CFA-9429-B5EDE9891DCA@FreeBSD.org> References: <201409051646.s85GkSm0008980@svn.freebsd.org> <20140907055355.GK17059@FreeBSD.org> To: Gleb Smirnoff X-Mailer: Apple Mail (2.1878.6) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 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: Sun, 07 Sep 2014 06:12:34 -0000 On 7 Sep 2014, at 11:23, Gleb Smirnoff wrote: > R> Modified: head/sys/sys/mbuf.h > R> = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > R> --- head/sys/sys/mbuf.h Fri Sep 5 16:40:47 2014 = (r271173) > R> +++ head/sys/sys/mbuf.h Fri Sep 5 16:46:28 2014 = (r271174) > R> @@ -672,7 +672,7 @@ m_clget(struct mbuf *m, int how) > R> { > R> =20 > R> if (m->m_flags & M_EXT) > R> - printf("%s: %p mbuf already has cluster\n", __func__, = m); > R> + printf("%s: %p mbuf already has external storage\n", = __func__, m); > R> m->m_ext.ext_buf =3D (char *)NULL; > R> uma_zalloc_arg(zone_clust, m, how); > R> /* > R> @@ -698,7 +698,7 @@ m_cljget(struct mbuf *m, int how, int si > R> uma_zone_t zone; > R> =20 > R> if (m && m->m_flags & M_EXT) > R> - printf("%s: %p mbuf already has cluster\n", __func__, = m); > R> + printf("%s: %p mbuf already has external storage\n", = __func__, m); > R> if (m !=3D NULL) > R> m->m_ext.ext_buf =3D NULL; >=20 > Shouldn't these be KASSERTs? I'm pretty sure that Andre put it as = printf(9) > because he was not sure it is correct. But since that time we never = seen > these prints in the wild, so they can be safely converted to KASSERTs. Hi Gleb: I agree that they should be KASSERT()s -- almost all if (x) panic(..) = should be -- but was working offline at the time and so didn't have a = chance to spelunk the mailing lists or GNATS/Bugzilla to see if I could = find references to the panics so left the current form as is. I am = currently on travel but have a TODO to do some spelunking when I get = back. I spotted a number of other similar constructs in the mbuf code, = which I'm currently working through fairly closely looking at the = variable-size mbuf changes, which depend on a number of cleanups. (The = ones I've made thus far are cosmetic, but less purely cosmetic ones will = follow soon.) Robert=