svn commit: r274504 - head/sys/kern

[Gleb Smirnoff]

Author: glebius
Date: Fri Nov 14 15:33:40 2014
New Revision: 274504
URL: https://svnweb.freebsd.org/changeset/base/274504

Log:
  Merge from projects/sendfile:
    Use sbcut_locked() instead of manually editing a sockbuf.
  
  Sponsored by:	Nginx, Inc.

Modified:
  head/sys/kern/uipc_socket.c

Modified: head/sys/kern/uipc_socket.c
==============================================================================
--- head/sys/kern/uipc_socket.c	Fri Nov 14 14:45:36 2014	(r274503)
+++ head/sys/kern/uipc_socket.c	Fri Nov 14 15:33:40 2014	(r274504)
@@ -1809,9 +1809,7 @@ dontblock:
 						SOCKBUF_LOCK(&so->so_rcv);
 					}
 				}
-				m->m_data += len;
-				m->m_len -= len;
-				so->so_rcv.sb_cc -= len;
+				sbcut_locked(&so->so_rcv, len);
 			}
 		}
 		SOCKBUF_LOCK_ASSERT(&so->so_rcv);