From owner-svn-src-projects@FreeBSD.ORG Tue Oct 7 17:23:11 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D38B39E1; Tue, 7 Oct 2014 17:23:11 +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 BF02F17F; Tue, 7 Oct 2014 17:23:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s97HNBh3006883; Tue, 7 Oct 2014 17:23:11 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s97HNBF7006882; Tue, 7 Oct 2014 17:23:11 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201410071723.s97HNBF7006882@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Tue, 7 Oct 2014 17:23:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r272711 - projects/sendfile/sys/kern 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: Tue, 07 Oct 2014 17:23:12 -0000 Author: glebius Date: Tue Oct 7 17:23:11 2014 New Revision: 272711 URL: https://svnweb.freebsd.org/changeset/base/272711 Log: Fix stupid error in r272703. Sponsored by: Netflix 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 Tue Oct 7 17:08:53 2014 (r272710) +++ projects/sendfile/sys/kern/uipc_sockbuf.c Tue Oct 7 17:23:11 2014 (r272711) @@ -151,16 +151,18 @@ sbfree(struct sockbuf *sb, struct mbuf * sb->sb_acc -= m->m_len; if (m == sb->sb_fnrdy) { + struct mbuf *n; + KASSERT(m->m_flags & M_NOTREADY, ("%s: m %p !M_NOTREADY", __func__, m)); - m = m->m_next; - while (m != NULL && !(m->m_flags & M_NOTREADY)) { - m->m_flags &= ~M_BLOCKED; - sb->sb_acc += m->m_len; - m = m->m_next; + n = m->m_next; + while (n != NULL && !(n->m_flags & M_NOTREADY)) { + n->m_flags &= ~M_BLOCKED; + sb->sb_acc += n->m_len; + n = m->m_next; } - sb->sb_fnrdy = m; + sb->sb_fnrdy = n; } if (m->m_type != MT_DATA && m->m_type != MT_OOBDATA)