From owner-svn-src-projects@FreeBSD.ORG Fri Jun 15 21:45:25 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 528E5106564A; Fri, 15 Jun 2012 21:45:25 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3BDFF8FC1C; Fri, 15 Jun 2012 21:45:25 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5FLjP3K005304; Fri, 15 Jun 2012 21:45:25 GMT (envelope-from rmacklem@svn.freebsd.org) Received: (from rmacklem@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5FLjP0s005301; Fri, 15 Jun 2012 21:45:25 GMT (envelope-from rmacklem@svn.freebsd.org) Message-Id: <201206152145.q5FLjP0s005301@svn.freebsd.org> From: Rick Macklem Date: Fri, 15 Jun 2012 21:45:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r237146 - projects/nfsv4.1-client/sys/rpc X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 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, 15 Jun 2012 21:45:25 -0000 Author: rmacklem Date: Fri Jun 15 21:45:24 2012 New Revision: 237146 URL: http://svn.freebsd.org/changeset/base/237146 Log: Fix a refence count problem for the backchannel SVCXPRT structure. Modified: projects/nfsv4.1-client/sys/rpc/clnt_rc.c projects/nfsv4.1-client/sys/rpc/svc_vc.c Modified: projects/nfsv4.1-client/sys/rpc/clnt_rc.c ============================================================================== --- projects/nfsv4.1-client/sys/rpc/clnt_rc.c Fri Jun 15 20:27:15 2012 (r237145) +++ projects/nfsv4.1-client/sys/rpc/clnt_rc.c Fri Jun 15 21:45:24 2012 (r237146) @@ -367,6 +367,7 @@ static bool_t clnt_reconnect_control(CLIENT *cl, u_int request, void *info) { struct rc_data *rc = (struct rc_data *)cl->cl_private; + SVCXPRT *xprt; if (info == NULL) { return (FALSE); @@ -449,6 +450,10 @@ clnt_reconnect_control(CLIENT *cl, u_int break; case CLSET_BACKCHANNEL: +printf("clntrc reg backch\n"); + xprt = (SVCXPRT *)info; + SVC_ACQUIRE(xprt); + xprt_register(xprt); rc->rc_backchannel = info; break; @@ -488,9 +493,16 @@ static void clnt_reconnect_destroy(CLIENT *cl) { struct rc_data *rc = (struct rc_data *)cl->cl_private; + SVCXPRT *xprt; if (rc->rc_client) CLNT_DESTROY(rc->rc_client); + if (rc->rc_backchannel) { +printf("clntrc dereg backch\n"); + xprt = (SVCXPRT *)rc->rc_backchannel; + xprt_unregister(xprt); + SVC_RELEASE(xprt); + } crfree(rc->rc_ucred); mtx_destroy(&rc->rc_lock); mem_free(rc, sizeof(*rc)); Modified: projects/nfsv4.1-client/sys/rpc/svc_vc.c ============================================================================== --- projects/nfsv4.1-client/sys/rpc/svc_vc.c Fri Jun 15 20:27:15 2012 (r237145) +++ projects/nfsv4.1-client/sys/rpc/svc_vc.c Fri Jun 15 21:45:24 2012 (r237146) @@ -294,9 +294,6 @@ svc_vc_create_backchannel(SVCPOOL *pool) xprt->xp_p1 = cd; xprt->xp_p2 = NULL; xprt->xp_ops = &svc_vc_backchannel_ops; - - xprt_register(xprt); - return (xprt); }