From patchwork Thu Jan 6 02:04:28 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Adamson X-Patchwork-Id: 457471 X-Patchwork-Delegate: Trond.Myklebust@netapp.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p06256PM015777 for ; Thu, 6 Jan 2011 02:05:11 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753274Ab1AFCFJ (ORCPT ); Wed, 5 Jan 2011 21:05:09 -0500 Received: from mx2.netapp.com ([216.240.18.37]:15622 "EHLO mx2.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753481Ab1AFCFI (ORCPT ); Wed, 5 Jan 2011 21:05:08 -0500 X-IronPort-AV: E=Sophos;i="4.60,280,1291622400"; d="scan'208";a="502192370" Received: from smtp1.corp.netapp.com ([10.57.156.124]) by mx2-out.netapp.com with ESMTP; 05 Jan 2011 18:05:07 -0800 Received: from localhost.localdomain (isabel3-lxp.hq.netapp.com [10.58.58.218] (may be forged)) by smtp1.corp.netapp.com (8.13.1/8.13.1/NTAP-1.6) with ESMTP id p06252ZG017606; Wed, 5 Jan 2011 18:05:07 -0800 (PST) From: andros@netapp.com To: trond.myklebust@netapp.com Cc: bfields@redhat.com, linux-nfs@vger.kernel.org, Andy Adamson Subject: [PATCH_V9 05/12] NFS use svc_create_xprt for NFSv4.1 callback service Date: Wed, 5 Jan 2011 21:04:28 -0500 Message-Id: <1294279475-8540-6-git-send-email-andros@netapp.com> X-Mailer: git-send-email 1.6.6 In-Reply-To: <1294279475-8540-5-git-send-email-andros@netapp.com> References: <1294279475-8540-1-git-send-email-andros@netapp.com> <1294279475-8540-2-git-send-email-andros@netapp.com> <1294279475-8540-3-git-send-email-andros@netapp.com> <1294279475-8540-4-git-send-email-andros@netapp.com> <1294279475-8540-5-git-send-email-andros@netapp.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Thu, 06 Jan 2011 02:05:11 +0000 (UTC) diff --git a/fs/nfs/callback.c b/fs/nfs/callback.c index 93a8b3b..0e9fae8 100644 --- a/fs/nfs/callback.c +++ b/fs/nfs/callback.c @@ -177,30 +177,38 @@ nfs41_callback_svc(void *vrqstp) struct svc_rqst * nfs41_callback_up(struct svc_serv *serv, struct rpc_xprt *xprt) { - struct svc_xprt *bc_xprt; - struct svc_rqst *rqstp = ERR_PTR(-ENOMEM); + struct svc_rqst *rqstp; + int ret; - dprintk("--> %s\n", __func__); - /* Create a svc_sock for the service */ - bc_xprt = svc_sock_create(serv, xprt->prot); - if (!bc_xprt) + /* + * Create an svc_sock for the back channel service that shares the + * fore channel connection. + * Returns the input port (0) and sets the svc_serv bc_xprt on success + */ + ret = svc_create_xprt(serv, "tcp-bc", &init_net, PF_INET, 0, + SVC_SOCK_ANONYMOUS); + if (ret < 0) { + rqstp = ERR_PTR(ret); goto out; + } /* * Save the svc_serv in the transport so that it can * be referenced when the session backchannel is initialized */ - serv->bc_xprt = bc_xprt; xprt->bc_serv = serv; INIT_LIST_HEAD(&serv->sv_cb_list); spin_lock_init(&serv->sv_cb_lock); init_waitqueue_head(&serv->sv_cb_waitq); rqstp = svc_prepare_thread(serv, &serv->sv_pools[0]); - if (IS_ERR(rqstp)) - svc_sock_destroy(bc_xprt); + if (IS_ERR(rqstp)) { + svc_xprt_put(serv->bc_xprt); + serv->bc_xprt = NULL; + } out: - dprintk("--> %s return %p\n", __func__, rqstp); + dprintk("--> %s return %ld\n", __func__, + IS_ERR(rqstp) ? PTR_ERR(rqstp) : 0); return rqstp; }