From owner-svn-src-projects@FreeBSD.ORG  Fri Nov 14 15:39:12 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
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 2B427EB7;
 Fri, 14 Nov 2014 15:39:12 +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 1850F7B7;
 Fri, 14 Nov 2014 15:39:12 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAEFdBF2097717;
 Fri, 14 Nov 2014 15:39:11 GMT (envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAEFdBVw097716;
 Fri, 14 Nov 2014 15:39:11 GMT (envelope-from glebius@FreeBSD.org)
Message-Id: <201411141539.sAEFdBVw097716@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: glebius set sender to
 glebius@FreeBSD.org using -f
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Fri, 14 Nov 2014 15:39:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r274508 - 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 &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 14 Nov 2014 15:39:12 -0000

Author: glebius
Date: Fri Nov 14 15:39:11 2014
New Revision: 274508
URL: https://svnweb.freebsd.org/changeset/base/274508

Log:
  Rename sf_io_done() to sf_iodone(), to better match VOP_GETPAGES_ASYNC()
  argument name.

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

Modified: projects/sendfile/sys/kern/uipc_syscalls.c
==============================================================================
--- projects/sendfile/sys/kern/uipc_syscalls.c	Fri Nov 14 15:38:03 2014	(r274507)
+++ projects/sendfile/sys/kern/uipc_syscalls.c	Fri Nov 14 15:39:11 2014	(r274508)
@@ -2078,7 +2078,7 @@ struct sf_io {
 };
 
 static void
-sf_io_done(void *arg)
+sf_iodone(void *arg)
 {
 	struct sf_io *sfio = arg;
 	struct socket *so;
@@ -2151,7 +2151,7 @@ sendfile_swapin(vm_object_t obj, struct 
 
 		refcount_acquire(&sfio->nios);
 		rv = vm_pager_get_pages_async(obj, pa + i, count, 0,
-		    &sf_io_done, sfio);
+		    &sf_iodone, sfio);
 
 		KASSERT(rv == VM_PAGER_OK, ("%s: pager fail obj %p page %p",
 		    __func__, obj, pa[i]));
@@ -2578,7 +2578,7 @@ retry_space:
 			fhold(sock_fp);
 			error = (*so->so_proto->pr_usrreqs->pru_send)
 			    (so, PRUS_NOTREADY, m, NULL, NULL, td);
-			sf_io_done(sfio);
+			sf_iodone(sfio);
 		}
 		CURVNET_RESTORE();