From owner-svn-src-user@FreeBSD.ORG Tue Nov 4 19:26:39 2008 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C03B310656DA; Tue, 4 Nov 2008 19:26:39 +0000 (UTC) (envelope-from dfr@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id AF3478FC29; Tue, 4 Nov 2008 19:26:39 +0000 (UTC) (envelope-from dfr@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mA4JQdow005814; Tue, 4 Nov 2008 19:26:39 GMT (envelope-from dfr@svn.freebsd.org) Received: (from dfr@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id mA4JQdAj005812; Tue, 4 Nov 2008 19:26:39 GMT (envelope-from dfr@svn.freebsd.org) Message-Id: <200811041926.mA4JQdAj005812@svn.freebsd.org> From: Doug Rabson Date: Tue, 4 Nov 2008 19:26:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r184657 - in user/dfr/gssapi/7/sys: nfsserver rpc X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Nov 2008 19:26:39 -0000 Author: dfr Date: Tue Nov 4 19:26:39 2008 New Revision: 184657 URL: http://svn.freebsd.org/changeset/base/184657 Log: Adjust for changes in KPI between RELENG_7 and current. Modified: user/dfr/gssapi/7/sys/nfsserver/nfs_srvkrpc.c user/dfr/gssapi/7/sys/rpc/svc.c Modified: user/dfr/gssapi/7/sys/nfsserver/nfs_srvkrpc.c ============================================================================== --- user/dfr/gssapi/7/sys/nfsserver/nfs_srvkrpc.c Tue Nov 4 19:23:48 2008 (r184656) +++ user/dfr/gssapi/7/sys/nfsserver/nfs_srvkrpc.c Tue Nov 4 19:26:39 2008 (r184657) @@ -121,7 +121,7 @@ static int nfssvc_nfsd(struct thread *, extern u_long sb_max_adj; int32_t (*nfsrv3_procs[NFS_NPROCS])(struct nfsrv_descript *nd, - struct nfssvc_sock *slp, struct mbuf **mreqp) = { + struct nfssvc_sock *slp, struct thread *td, struct mbuf **mreqp) = { nfsrv_null, nfsrv_getattr, nfsrv_setattr, @@ -316,7 +316,7 @@ nfssvc_program(struct svc_req *rqst, SVC { rpcproc_t procnum; int32_t (*proc)(struct nfsrv_descript *nd, struct nfssvc_sock *slp, - struct mbuf **mreqp); + struct thread *td, struct mbuf **mreqp); int flag; struct nfsrv_descript nd; struct mbuf *mreq, *mrep; @@ -372,7 +372,7 @@ nfssvc_program(struct svc_req *rqst, SVC } nfsrvstats.srvrpccnt[nd.nd_procnum]++; - error = proc(&nd, NULL, &mrep); + error = proc(&nd, NULL, curthread, &mrep); if (nd.nd_cr) crfree(nd.nd_cr); Modified: user/dfr/gssapi/7/sys/rpc/svc.c ============================================================================== --- user/dfr/gssapi/7/sys/rpc/svc.c Tue Nov 4 19:23:48 2008 (r184656) +++ user/dfr/gssapi/7/sys/rpc/svc.c Tue Nov 4 19:26:39 2008 (r184657) @@ -1186,18 +1186,16 @@ svc_thread_start(void *arg) { svc_run_internal((SVCPOOL *) arg, FALSE); - kthread_exit(); + kthread_exit(0); } static void svc_new_thread(SVCPOOL *pool) { - struct thread *td; pool->sp_threadcount++; - kthread_add(svc_thread_start, pool, - pool->sp_proc, &td, 0, 0, - "%s: service", pool->sp_name); + kthread_create(svc_thread_start, pool, + NULL, 0, 0, "%s: service", pool->sp_name); } void