Skip site navigation (1)Skip section navigation (2) 
Date:      Fri, 14 Nov 2014 19:08:20 +0000 (UTC)
From:      Gleb Smirnoff <glebius@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject:   svn commit: r274524 - in projects/sendfile/sys: kern sys
Message-ID:  <201411141908.sAEJ8KNI097946@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: glebius
Date: Fri Nov 14 19:08:19 2014
New Revision: 274524
URL: https://svnweb.freebsd.org/changeset/base/274524

Log:
  A better English name for the new mbuf flag.

Modified:
  projects/sendfile/sys/kern/uipc_sockbuf.c
  projects/sendfile/sys/sys/sockbuf.h

Modified: projects/sendfile/sys/kern/uipc_sockbuf.c
==============================================================================
--- projects/sendfile/sys/kern/uipc_sockbuf.c	Fri Nov 14 18:44:13 2014	(r274523)
+++ projects/sendfile/sys/kern/uipc_sockbuf.c	Fri Nov 14 19:08:19 2014	(r274524)
@@ -78,15 +78,15 @@ sbready(struct sockbuf *sb, struct mbuf 
 
 	SOCKBUF_LOCK_ASSERT(sb);
 
-	if (m->m_flags & M_SBCUTTED) {
+	if (m->m_flags & M_SBCUT) {
 		/*
 		 * Oops, something bad happened to the socket buffer while
 		 * we were working on the data.  Our mbufs are detached from
 		 * the sockbuf, and all what we can do is free them.
 		 */
 		for (int i = 0; i < count; i++) {
-			KASSERT(m->m_flags & M_SBCUTTED,
-			    ("%s: m %p !M_SBCUTTED", __func__, m));
+			KASSERT(m->m_flags & M_SBCUT,
+			    ("%s: m %p !M_SBCUT", __func__, m));
 			m = m_free(m);
 		}
 		return (EPIPE);
@@ -1060,7 +1060,7 @@ sbcut_internal(struct sockbuf *sb, int l
 		sbfree(sb, m);
 		n = m->m_next;
 		if (m->m_flags & M_NOTREADY)
-			m->m_flags |= M_SBCUTTED;
+			m->m_flags |= M_SBCUT;
 		else {
 			m->m_next = mfree;
 			mfree = m;

Modified: projects/sendfile/sys/sys/sockbuf.h
==============================================================================
--- projects/sendfile/sys/sys/sockbuf.h	Fri Nov 14 18:44:13 2014	(r274523)
+++ projects/sendfile/sys/sys/sockbuf.h	Fri Nov 14 19:08:19 2014	(r274524)
@@ -128,7 +128,7 @@ struct	sockbuf {
 #define	M_NOTREADY	M_PROTO1	/* m_data not populated yet */
 #define	M_BLOCKED	M_PROTO2	/* M_NOTREADY in front of m */
 #define	M_NOTAVAIL	(M_NOTREADY | M_BLOCKED)
-#define	M_SBCUTTED	M_PROTO3	/* mbuf was sbcutted out */
+#define	M_SBCUT		M_PROTO3	/* mbuf was sbcutted out */
 
 void	sbappend(struct sockbuf *sb, struct mbuf *m);
 void	sbappend_locked(struct sockbuf *sb, struct mbuf *m);

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411141908.sAEJ8KNI097946>