From patchwork Fri Feb 5 21:08:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Adamson X-Patchwork-Id: 8239351 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id D4075BEEE5 for ; Fri, 5 Feb 2016 21:08:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 19D1720383 for ; Fri, 5 Feb 2016 21:08:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 301E920389 for ; Fri, 5 Feb 2016 21:08:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752870AbcBEVIx (ORCPT ); Fri, 5 Feb 2016 16:08:53 -0500 Received: from mx144.netapp.com ([216.240.21.25]:19893 "EHLO mx144.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751611AbcBEVIw (ORCPT ); Fri, 5 Feb 2016 16:08:52 -0500 X-IronPort-AV: E=Sophos;i="5.22,402,1449561600"; d="scan'208";a="96469573" Received: from vmwexchts01-prd.hq.netapp.com ([10.122.105.12]) by mx144-out.netapp.com with ESMTP; 05 Feb 2016 13:08:51 -0800 Received: from smtp2.corp.netapp.com (10.57.159.114) by VMWEXCHTS01-PRD.hq.netapp.com (10.122.105.12) with Microsoft SMTP Server id 15.0.1156.6; Fri, 5 Feb 2016 13:08:49 -0800 Received: from localhost.localdomain (andros-new.vpn.netapp.com [10.55.67.64]) by smtp2.corp.netapp.com (8.13.1/8.13.1/NTAP-1.6) with ESMTP id u15L8ivd027795; Fri, 5 Feb 2016 13:08:49 -0800 (PST) From: To: CC: , Andy Adamson Subject: [PATCH RFC Version 1 6/6] NFS schedule bind_conn_to_session for new NFSv4.1 transport Date: Fri, 5 Feb 2016 16:08:38 -0500 Message-ID: <1454706518-4641-7-git-send-email-andros@netapp.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1454706518-4641-1-git-send-email-andros@netapp.com> References: <1454706518-4641-1-git-send-email-andros@netapp.com> MIME-Version: 1.0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-7.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Andy Adamson Complete session trunking with the BIND_CONN_TO_SESSION call. NFS cleanup after session trunking transport added Signed-off-by: Andy Adamson --- fs/nfs/nfs4client.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/fs/nfs/nfs4client.c b/fs/nfs/nfs4client.c index 6736805..b0423f7 100644 --- a/fs/nfs/nfs4client.c +++ b/fs/nfs/nfs4client.c @@ -423,8 +423,17 @@ struct nfs_client *nfs4_init_client(struct nfs_client *clp, .servername = clp->cl_hostname, }; /* Add this address as an alias */ - rpc_clnt_add_xprt(old->cl_rpcclient, &xprt_args, - rpc_clnt_test_and_add_xprt, NULL); + error = rpc_clnt_add_xprt(old->cl_rpcclient, &xprt_args, + rpc_clnt_test_and_add_xprt, NULL); + if (!error) { + nfs4_schedule_session_recovery(old->cl_session, + -NFS4ERR_CONN_NOT_BOUND_TO_SESSION); + + /** Cancel the 2nd mount */ + pr_info("NFS: Session trunk. CANCEL MOUNT\n"); + error = -EINVAL; + goto error; + } } clp->cl_preserve_clid = true; }