From patchwork Wed Feb 24 17:56:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Adamson X-Patchwork-Id: 8410701 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 9B6A29F372 for ; Wed, 24 Feb 2016 17:57:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D526720265 for ; Wed, 24 Feb 2016 17:56:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C47B820222 for ; Wed, 24 Feb 2016 17:56:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758121AbcBXR4z (ORCPT ); Wed, 24 Feb 2016 12:56:55 -0500 Received: from mx144.netapp.com ([216.240.21.25]:61755 "EHLO mx144.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757026AbcBXR4y (ORCPT ); Wed, 24 Feb 2016 12:56:54 -0500 X-IronPort-AV: E=Sophos;i="5.22,494,1449561600"; d="scan'208";a="100149189" Received: from vmwexchts03-prd.hq.netapp.com ([10.122.105.31]) by mx144-out.netapp.com with ESMTP; 24 Feb 2016 09:56:53 -0800 Received: from smtp1.corp.netapp.com (10.57.156.124) by VMWEXCHTS03-PRD.hq.netapp.com (10.122.105.31) with Microsoft SMTP Server id 15.0.1156.6; Wed, 24 Feb 2016 09:56:53 -0800 Received: from localhost.localdomain (andros-new.vpn.netapp.com [10.55.66.190]) by smtp1.corp.netapp.com (8.13.1/8.13.1/NTAP-1.6) with ESMTP id u1OHup3q026451; Wed, 24 Feb 2016 09:56:53 -0800 (PST) From: To: CC: , Andy Adamson Subject: [PATCH Version 2 2/8] NFS default callback ops Date: Wed, 24 Feb 2016 12:56:21 -0500 Message-ID: <1456336587-17374-3-git-send-email-andros@netapp.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1456336587-17374-1-git-send-email-andros@netapp.com> References: <1456336587-17374-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=-6.9 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 Also use with refactored exchange_id for session trunking Signed-off-by: Andy Adamson --- fs/nfs/nfs4proc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index c70de30..a298a51 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -6783,12 +6783,12 @@ nfs41_same_server_scope(struct nfs41_server_scope *a, } static void -nfs4_bind_one_conn_to_session_done(struct rpc_task *task, void *calldata) +nfs4_proc_default_done(struct rpc_task *task, void *calldata) { } -static const struct rpc_call_ops nfs4_bind_one_conn_to_session_ops = { - .rpc_call_done = &nfs4_bind_one_conn_to_session_done, +static const struct rpc_call_ops nfs4_proc_default_ops = { + .rpc_call_done = &nfs4_proc_default_done, }; /* @@ -6819,7 +6819,7 @@ int nfs4_proc_bind_one_conn_to_session(struct rpc_clnt *clnt, struct rpc_task_setup task_setup_data = { .rpc_client = clnt, .rpc_xprt = xprt, - .callback_ops = &nfs4_bind_one_conn_to_session_ops, + .callback_ops = &nfs4_proc_default_ops, .rpc_message = &msg, .flags = RPC_TASK_TIMEOUT, };