svn commit: r274507 - projects/sendfile/sys/kern

[Gleb Smirnoff]

Author: glebius
Date: Fri Nov 14 15:38:03 2014
New Revision: 274507
URL: https://svnweb.freebsd.org/changeset/base/274507

Log:
  Assert that we are never asked to sbcut() an M_NOTREADY mbuf partially.
  
  Sponsored by:	Nginx, Inc.

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

Modified: projects/sendfile/sys/kern/uipc_sockbuf.c
==============================================================================
--- projects/sendfile/sys/kern/uipc_sockbuf.c	Fri Nov 14 15:36:48 2014	(r274506)
+++ projects/sendfile/sys/kern/uipc_sockbuf.c	Fri Nov 14 15:38:03 2014	(r274507)
@@ -1029,11 +1029,12 @@ sbcut_internal(struct sockbuf *sb, int l
 			continue;
 		}
 		if (m->m_len > len) {
+			KASSERT(!(m->m_flags & M_NOTAVAIL),
+			    ("%s: m %p M_NOTAVAIL", __func__, m));
 			m->m_len -= len;
 			m->m_data += len;
 			sb->sb_ccc -= len;
-			if (!(m->m_flags & M_NOTAVAIL))
-				sb->sb_acc -= len;
+			sb->sb_acc -= len;
 			if (sb->sb_sndptroff != 0)
 				sb->sb_sndptroff -= len;
 			if (m->m_type != MT_DATA && m->m_type != MT_OOBDATA)