From owner-svn-src-projects@FreeBSD.ORG Fri Nov 14 15:34:54 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 590E5A8E; Fri, 14 Nov 2014 15:34:54 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2BD88783; Fri, 14 Nov 2014 15:34:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAEFYsfs096476; Fri, 14 Nov 2014 15:34:54 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAEFYrKO096472; Fri, 14 Nov 2014 15:34:53 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201411141534.sAEFYrKO096472@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Fri, 14 Nov 2014 15:34:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274505 - in projects/sendfile/sys: kern sys X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Nov 2014 15:34:54 -0000 Author: glebius Date: Fri Nov 14 15:34:52 2014 New Revision: 274505 URL: https://svnweb.freebsd.org/changeset/base/274505 Log: Remove sbmtrim(). Modified: projects/sendfile/sys/kern/uipc_sockbuf.c projects/sendfile/sys/kern/uipc_socket.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 15:33:40 2014 (r274504) +++ projects/sendfile/sys/kern/uipc_sockbuf.c Fri Nov 14 15:34:52 2014 (r274505) @@ -184,22 +184,6 @@ sbfree(struct sockbuf *sb, struct mbuf * } /* - * Trim some amount of data from (first?) mbuf in buffer. - */ -void -sbmtrim(struct sockbuf *sb, struct mbuf *m, int len) -{ - - SOCKBUF_LOCK_ASSERT(sb); - KASSERT(len < m->m_len, ("%s: m %p len %d", __func__, m, len)); - - m->m_data += len; - m->m_len -= len; - sb->sb_acc -= len; - sb->sb_ccc -= len; -} - -/* * Socantsendmore indicates that no more data will be sent on the socket; it * would normally be applied to a socket when the user informs the system * that no more data is to be sent, by the protocol code (in case Modified: projects/sendfile/sys/kern/uipc_socket.c ============================================================================== --- projects/sendfile/sys/kern/uipc_socket.c Fri Nov 14 15:33:40 2014 (r274504) +++ projects/sendfile/sys/kern/uipc_socket.c Fri Nov 14 15:34:52 2014 (r274505) @@ -1810,7 +1810,7 @@ dontblock: SOCKBUF_LOCK(&so->so_rcv); } } - sbmtrim(&so->so_rcv, m, len); + sbcut_locked(&so->so_rcv, len); } } SOCKBUF_LOCK_ASSERT(&so->so_rcv); Modified: projects/sendfile/sys/sys/sockbuf.h ============================================================================== --- projects/sendfile/sys/sys/sockbuf.h Fri Nov 14 15:33:40 2014 (r274504) +++ projects/sendfile/sys/sys/sockbuf.h Fri Nov 14 15:34:52 2014 (r274505) @@ -174,7 +174,6 @@ int sblock(struct sockbuf *sb, int flags void sbunlock(struct sockbuf *sb); void sballoc(struct sockbuf *, struct mbuf *); void sbfree(struct sockbuf *, struct mbuf *); -void sbmtrim(struct sockbuf *, struct mbuf *, int); int sbready(struct sockbuf *, struct mbuf *, int); /*