From owner-svn-src-head@FreeBSD.ORG Sun Sep 7 05:53:58 2014 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AF4AAA70; Sun, 7 Sep 2014 05:53:58 +0000 (UTC) Received: from cell.glebius.int.ru (glebius.int.ru [81.19.69.10]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "cell.glebius.int.ru", Issuer "cell.glebius.int.ru" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 31DAB14D1; Sun, 7 Sep 2014 05:53:57 +0000 (UTC) Received: from cell.glebius.int.ru (localhost [127.0.0.1]) by cell.glebius.int.ru (8.14.9/8.14.9) with ESMTP id s875rtQs027039 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Sun, 7 Sep 2014 09:53:55 +0400 (MSK) (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by cell.glebius.int.ru (8.14.9/8.14.9/Submit) id s875rt4s027038; Sun, 7 Sep 2014 09:53:55 +0400 (MSK) (envelope-from glebius@FreeBSD.org) X-Authentication-Warning: cell.glebius.int.ru: glebius set sender to glebius@FreeBSD.org using -f Date: Sun, 7 Sep 2014 09:53:55 +0400 From: Gleb Smirnoff To: Robert Watson Subject: Re: svn commit: r271174 - head/sys/sys Message-ID: <20140907055355.GK17059@FreeBSD.org> References: <201409051646.s85GkSm0008980@svn.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201409051646.s85GkSm0008980@svn.freebsd.org> User-Agent: Mutt/1.5.23 (2014-03-12) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Sep 2014 05:53:58 -0000 Robert, On Fri, Sep 05, 2014 at 04:46:28PM +0000, Robert Watson wrote: R> Author: rwatson R> Date: Fri Sep 5 16:46:28 2014 R> New Revision: 271174 R> URL: http://svnweb.freebsd.org/changeset/base/271174 R> R> Log: R> Clarify a diagnostic printf() in the mbuf code: M_EXT doesn't necessarily R> imply a cluster is attached; it could also refer to some other sort of R> external storage (e.g., an sf_buf). R> R> MFC after: 3 days R> Sponsored by: EMC / Isilon Storage Division R> R> Modified: R> head/sys/sys/mbuf.h R> R> Modified: head/sys/sys/mbuf.h R> ============================================================================== 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> 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 = (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> 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 != NULL) R> m->m_ext.ext_buf = NULL; 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. -- Totus tuus, Glebius.