From patchwork Wed Jan 11 18:54:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Schumaker, Anna" X-Patchwork-Id: 9511041 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id EC56260710 for ; Wed, 11 Jan 2017 18:55:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E06D42866E for ; Wed, 11 Jan 2017 18:55:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D546528676; Wed, 11 Jan 2017 18:55:18 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3EA292866E for ; Wed, 11 Jan 2017 18:55:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752190AbdAKSzP (ORCPT ); Wed, 11 Jan 2017 13:55:15 -0500 Received: from mx141.netapp.com ([216.240.21.12]:19473 "EHLO mx141.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753382AbdAKSzL (ORCPT ); Wed, 11 Jan 2017 13:55:11 -0500 X-IronPort-AV: E=Sophos;i="5.33,346,1477983600"; d="scan'208";a="175756382" Received: from hioexcmbx03-prd.hq.netapp.com ([10.122.105.36]) by mx141-out.netapp.com with ESMTP; 11 Jan 2017 10:50:30 -0800 Received: from VMWEXCCAS06-PRD.hq.netapp.com (10.122.105.22) by hioexcmbx03-prd.hq.netapp.com (10.122.105.36) with Microsoft SMTP Server (TLS) id 15.0.1210.3; Wed, 11 Jan 2017 10:55:09 -0800 Received: from NAM03-DM3-obe.outbound.protection.outlook.com (10.120.60.153) by VMWEXCCAS06-PRD.hq.netapp.com (10.122.105.22) with Microsoft SMTP Server (TLS) id 15.0.1210.3 via Frontend Transport; Wed, 11 Jan 2017 10:55:09 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netapp.onmicrosoft.com; s=selector1-netapp-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=4o85kXUxpeL6AalXaTTriYxBkCtXB+rj3l6WriQU84Y=; b=NP3NMT/ElCj2n75+LMz1LyGPN3nTokpV+3cfXxAt14d1ETBHTVFWOhPNFF/PeHT2FkSYz7FHOnyDo2X5LsJYPcsz2FDX7h3slpqCmJcG0+xSbGSDvgcCthOJqgx5gjNlXhpJs6Eo7M1Av8wp5VT5FBcXoU3M8DyUc6zeZKB3GtQ= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Anna.Schumaker@netapp.com; Received: from gouda.nowheycreamery.com.nowheycreamery.com (99.9.112.69) by CY1PR0601MB1642.namprd06.prod.outlook.com (10.163.232.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.829.7; Wed, 11 Jan 2017 18:55:07 +0000 From: To: Subject: [PATCH 05/11] NFS: Create a single nfs4_setup_sequence() function Date: Wed, 11 Jan 2017 13:54:48 -0500 Message-ID: <20170111185454.9315-6-Anna.Schumaker@Netapp.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170111185454.9315-1-Anna.Schumaker@Netapp.com> References: <20170111185454.9315-1-Anna.Schumaker@Netapp.com> MIME-Version: 1.0 X-Originating-IP: [99.9.112.69] X-ClientProxiedBy: CY1PR0201CA0001.namprd02.prod.outlook.com (10.163.30.139) To CY1PR0601MB1642.namprd06.prod.outlook.com (10.163.232.16) X-MS-Office365-Filtering-Correlation-Id: 8dfc95c5-0a69-4a52-2e73-08d43a535c90 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:CY1PR0601MB1642; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0601MB1642; 3:yFyykdaz8ufsx018PJCDVTLxfcGlhykuxzGciAAnd3Vfa9EYSAgmMOJINgtEnM8PbkVPADhSSaWoAo4JdInAC964HFrbOQwUTuf0DydkOj4/HVf9LnV5LQTiW/gtpfZq8PuD503qqMA6BK+yo81s9nrsIRghLovhvKB/WSfToP2+ZeZzpK8HH+dIKYPEaNc6QO3MPYdDoyzYFfbcq/PVJYWqAvJyZI0OxWrxM3HAswet7LZzroS0b3UC6K+2O/oNBaj7BPWFi4SXPJxjhc4mdw==; 25:gmI30CGw2B/a8z1FuQr46oYd7o5cIbObBukig+Ap9wDTWPUo35v+yxJtg3ikr9aQTLNRsKuEoEnRRwg/pJSlBboONEUZYyvNc8XNBTFnXlYeNURsf6GETarXR8JOKE/ivvm5bDR+eCg+EWkyXsrXynoJzpYZ0Dnl74XwkgkTa0VHLx7CyIgxDvi4L214Fy2DMigRr55xpx2V0ob2z54wXlixmzHVUvT9Om4RW5ExyU3HuG36XxUpMgzhpM9QI2aVnn2DiFFxBUZajy8Y31tnwigiBAkBriVcLLqUNN32/b084fmK0Zo5blP0tR4XaqNyMhdru9EaXbTCapJg2B24093mvwIFXZ6K8+jDYHjZfVj/+6uoyvUFJMSJkBQi4zuH9uG5k5HQfFmH4h0zm/UJ35Wu6tZCjrdizgYbp3MxTdJ7dolfbhGbu3muhMPhxVcgsnIXEqPC9SdzrUr27B0tMA== X-Microsoft-Exchange-Diagnostics: 1; CY1PR0601MB1642; 31:JMLGcNPfWL0X1KNNsiHjH2F9mdOGiAIdpWa3/O2JfBVXVIC0QC5a/5LFYZKw849i1ygBhC/GD6/oTLfLce/TiWr1PJhFWG5knMtA50wCkeZs0nLPQSaI5J7QRBCHB4YsBsQyYzzpzK5LGXSpPpqwzcLyZAz2szLs3GKX04urI8VH5PMgazMT66SdSGKr8bWh0Kgsm1WSsqD2pesjmzZW42wKFeHnfXmL9xhGBY0YXjACt6GIfx25ZeGraPHMQk1rnXGkiavct1EAsmYOP1lBbw==; 20:XltK67bUBgFiOY2S71dIp0K3ddm8RL5KmN6IajoGhEqdDnht8GVUbo4el9mGyBHIMNhQGvpNJe4m8Yf64Es+2Y/H/j78WSfjDG1hZ9CCar/5vR8SiTNdy9OZ66AujaOFaVt5G68P4jz2duOBR6B3JVJqWhV9bpPMy+j04GV56a1PDwPBfwHRPiezFoXHLHXp/XObDz1382ChEofz3q9GZj12chzljq3TC5B4aOFYC70h/HHTQ0OqA5EAcxY2i90KmphMeXEk56JHkCJFTCW6s/IkR9ArpuvQenIAlhHcvFoO4KdRKUfj+Z4xptMTTLaDQMy7DpkBPXufXjiaaICQfwygEWNLstpYWqN8jemLfpYks6Km3kknFmNBPsC8mrBdjhtgsFB4Eo3ItAkiGVAlnOxqOgpUpyPzGeWSWL+TOMPe+y7iYhZ1RPYdRHykoCfI5WLD6+fZ8e8+H811AB/MbL8SoqnDxLtabikpmnu/5WKeqiT07eDWQ4lG5o+ap1Z1 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(158342451672863); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(5005006)(8121501046)(3002001)(10201501046)(6055026)(6041248)(20161123562025)(20161123555025)(20161123564025)(20161123560025)(6072148); SRVR:CY1PR0601MB1642; BCL:0; PCL:0; RULEID:; SRVR:CY1PR0601MB1642; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0601MB1642; 4:e+KBHwqH1KWMiRr64+6jJQA6pyF68QLzmFywEP1cxQ7KnZoTwGlJomQBpBe/w8LbTk5k0C+eY4h8jsziMUNoJ4621N7acTck4UG9xBVPX1Q0krOCOSUTfIwp+v5UntksuWYYDiHPkR/3cMFnSbVXVadRr2d3qEt5udgM/XdOrc80/3eFTYKZ9oQLWp7DF05J6b/rB06/4pPwecowBwnAaTuC43waFqIK0Jrl3lvjtzhvyxxfpiKJeqDGPwpkTzOpjA4VnP6RgDks9sALB2wOC2CdwsMHbTgkRWNFvjPxSf2z4aHcDLUOeYxlgq4L1IdUuiZVQbSlI243Bb2IB+H4KOyyICmPYx5w7fgbb2wAjvNzq+Y4+ljk6/hGcVRZNsiJsHk0ApP5M34WCnleLrqxWU0vvD/AVZrfKpaS9oQfrN9E9a6v46AgVjjxELFP20SIXfy2uVFYBxaQXEyZZIsQf5BJ+k52TjTy/3XA1Jts1NMBEpG3y5kNNBlcADRwEnmzLHl6wov7sGDu8x3fdfXAfc2XrF9GGj5nn6plgr+zYKkiS2UowDufDoZvPuTuuXh7/P1UxT3PgPXd9jGpIsl8vHBolCy+nqkcz2X6EzRxz1b2K2mI/kpk4JUq+kMQ0PYxhUUUypgxa+haWJmyozll4g== X-Forefront-PRVS: 01842C458A X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(7916002)(39450400003)(199003)(189002)(50986999)(2950100002)(6666003)(6916009)(101416001)(92566002)(38730400001)(7736002)(76176999)(25786008)(305945005)(86362001)(2351001)(5660300001)(110136003)(6506006)(42186005)(5003940100001)(106356001)(105586002)(86152003)(2906002)(2876002)(6486002)(575784001)(66066001)(1076002)(3846002)(6116002)(189998001)(47776003)(8676002)(107886002)(50466002)(48376002)(97736004)(36756003)(450100001)(81166006)(81156014)(6512007)(50226002)(68736007)(15760500002); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR0601MB1642; H:gouda.nowheycreamery.com.nowheycreamery.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: netapp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR0601MB1642; 23:at+PfHmrZE5QTj6QF1IhDe7kMBvtv40u0wp69We?= =?us-ascii?Q?/ZZ8viVZGDeBjmJnEk6jZmjgjnuLiUqsfdy76SYZUW63zqx5zDhY1ykl7G7+?= =?us-ascii?Q?RPQOBm0o7QFXPjdT82hGg6iSDGKc1yS6YALW8+dFVz7xxazLTmliYJ5wkBxm?= =?us-ascii?Q?lgly/DwkcxhQnn47DZ9c5BIxoSVR81EDHRQDVd1nQH7KyZxnm9boFdJLstiv?= =?us-ascii?Q?HG/hoVzhAOPWWSEyE48IY8EQsAS/YKHRHMVA5ahKq7BiihUr3sPNEvhDHhyo?= =?us-ascii?Q?C95kkRpvbIfiEk7OcWDzn7fsrlnD8RYyBPJ1gTO/yf1sRxcqJhIQCgK8iNse?= =?us-ascii?Q?zgjBOQxcyGrDu5fEDs7d7K7DN4dpFKVvN+1kBZkbPIZ/77MPzp+NNba6ouat?= =?us-ascii?Q?sWGCPP/PPbTVaZzjItW5ATs3G67+1V/PiWtd+rEXVXL0ctuJiTFm6SnQUcYC?= =?us-ascii?Q?xjSR1MANUKzKkQBHcdaLlxj/gjy0t9ilYDhXDqGaepBFrWZQPV9sN7AG/saC?= =?us-ascii?Q?Lgx4/jz+Ah/zIzbk+Jk+2HCWDjiSGnZfbOPVjXd5pwh2YHzQMTHHocSZ2CTQ?= =?us-ascii?Q?/vL4l5Fs0Kz/jQVltq7ivGlVYN5jxz3v9t6pPBAYx6r6igRzklh0NaqkC0CZ?= =?us-ascii?Q?QRTbPqOMhxcWy9r8jHkMNp0iOvc4wU7JyB0iIsg+2OVmecQdjsxhQe+iBKQF?= =?us-ascii?Q?e1ppiLESOVNJOXHBof8QjwVIwjHLVIRWaDI5kJTy0pnp9rVgNPk32m+crmWG?= =?us-ascii?Q?AoQuDxf12b2PWCV9ATc9FLzbI00WwUtWvld7sBbzVi7lztzRfW7u3+THzeFh?= =?us-ascii?Q?wd+pe87Y3NvQAqHlxMEwvuXrR6Kr5hsgRk7g3/JqJ1/YMPD6wY3LOjg7N/Dv?= =?us-ascii?Q?nXtoxdUd9891y4iacRKOWrgtW31s3rLhrZ5IiQyOjIQA44gSgN1fy3jXQ7fW?= =?us-ascii?Q?UD/2BJd0tIPSJ4PhTSIljTU72IGJzlrZ0WBcOEeasHmtem0o3m9SAwvmUS5t?= =?us-ascii?Q?TRROU2ELtIe26HJ0K4oq2Qbs4X0dZT2TAugTyPS9096C8/169PopQVRTXiLO?= =?us-ascii?Q?W4UtbF3QFEhLj2KtuDlbLSOsvVdK3nEALmJGEzWTaV4SVQwc+MFNrC7r81U5?= =?us-ascii?Q?00MVJK0R+JXbF7zEe+45iHnQSm0tn40Yq1gkB5dutXJBGVrs/N6OEjZ7jgAg?= =?us-ascii?Q?ZeF/vVEBqVrlleHh4h8h3BfcwrMfazAHNgsCc?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR0601MB1642; 6:sWtIG19ONc4jPMsKJx+VD4Opf/xaZPeP1Z7Oh2rnXP4IgsXAIcpaWlJLZa0FusD5hdIDQb92tQ9mhe0Lmg61B3vz35FVfHnJAIYPIApLKk67IKteucf8D+tIQ92WSirh0golJEKLb7JSMF62QLJdcgpCWGug6f3sxQ0szIUSOMCF1igowyt9n7e+uuSyQVzlajdGrENf0PtIzgkRghNrqmtKs/BOR8R9FNVgsyHu0CyXkwCWRS6JauBBUkIklw81GeH5TzpgVmlTjzyhqEQUHRYpMtef6NLjX9pTyztJq+pWKb9/tlI9Fx0+dr4A6mBJALjER3CXKiy2AGRL58luJaMXB5FRtgsMUA+w4aKd0R3RX/CePxJdlcfH68dV4v/Qnng0gaFs+gjTo8zEAUsSecyn2HV7k/N81TzCoKJ2j44=; 5:P++jdBaOwiFW8lV6XFH91I5QhIKkxX7Cm5C6NXbF9p1W0S7Y/Mqx0K5ovMB90BZLlcM9CZFHYGYsMuRpynHCnOxqpc/pyBNTPs9aIxsol4eyleOS01g3dbhuKtp9KViz/2V6HK9rDzLFwzzrJJ2FnA==; 24:Z2oflC3P/4cHkr+DjWwJSlfpKQpR+qtkKBxlruShDbI313sAvtGZedphK2Ui41NWC/f6g8nhg0iS6qJ89+HvSaxc+WvvlMXgiH+htIKvDhc= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY1PR0601MB1642; 7:Oloj89L4nGfg9cqA6RK001I+cYSq++d9Hj7ozVkXoPpKJnuhCLIRIoBtzq2dIQDS//vMIew+KIy9p9vRjqmGy4XHNxLJVC2gopyXpobKKScf8xNZVUyazoIHASttgb10jrv25zCM8Ii4nuxctH4H37GTt39vzx+a6j5axa/bTQOdbZbeahFRi7uHbkZ0BNmra1B+2Kw0PHTxyU9fYEbTsigO3u/MpuKH7udnDYnF0hdhY0zPZODMyzv60ki9ze0KE6uRHaDL5OXhtH9Bv6wrI38lbd7eiqC0KX/gDi/H6f1vW/sg75azmeBeyAZVUiNv5lIvLyvotOVTnUoLOkSWbIHS1IDIn4fT7BBmBH88QEyXbZAvICMuVmIgCHpjTeKSMS4tI6KDHvRFGHwBZparEWNgF2i/rxhQgM2lEEyNr3VrRH6cbmBzy5Dt4xkSt//2ystbdf7Vmnjddk1tzgBlOQ== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jan 2017 18:55:07.3500 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR0601MB1642 X-OriginatorOrg: netapp.com Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Anna Schumaker The inline ifdef lets us put everything in a single place, rather than having two (very similar) versions of this function. Signed-off-by: Anna Schumaker --- fs/nfs/nfs4proc.c | 76 +++++++++++++++++++++---------------------------------- 1 file changed, 29 insertions(+), 47 deletions(-) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 3f7199a0b784..132d73435b8f 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -946,37 +946,14 @@ static int nfs41_setup_sequence(struct nfs4_session *session, return -EAGAIN; } -int nfs4_setup_sequence(const struct nfs_client *client, - struct nfs4_sequence_args *args, - struct nfs4_sequence_res *res, - struct rpc_task *task) -{ - struct nfs4_session *session = nfs4_get_session(client); - int ret = 0; - - if (!session) - return nfs40_setup_sequence(client->cl_slot_tbl, - args, res, task); - - dprintk("--> %s clp %p session %p sr_slot %u\n", - __func__, session->clp, session, res->sr_slot ? - res->sr_slot->slot_nr : NFS4_NO_SLOT); - - ret = nfs41_setup_sequence(session, args, res, task); - - dprintk("<-- %s status=%d\n", __func__, ret); - return ret; -} -EXPORT_SYMBOL_GPL(nfs4_setup_sequence); - static void nfs41_call_sync_prepare(struct rpc_task *task, void *calldata) { struct nfs4_call_sync_data *data = calldata; - struct nfs4_session *session = nfs4_get_session(data->seq_server->nfs_client); dprintk("--> %s data->seq_server %p\n", __func__, data->seq_server); - nfs41_setup_sequence(session, data->seq_args, data->seq_res, task); + nfs4_setup_sequence(data->seq_server->nfs_client, + data->seq_args, data->seq_res, task); } static void nfs41_call_sync_done(struct rpc_task *task, void *calldata) @@ -993,15 +970,6 @@ static const struct rpc_call_ops nfs41_call_sync_ops = { #else /* !CONFIG_NFS_V4_1 */ -int nfs4_setup_sequence(const struct nfs_client *client, - struct nfs4_sequence_args *args, - struct nfs4_sequence_res *res, - struct rpc_task *task) -{ - return nfs40_setup_sequence(client->cl_slot_tbl, args, res, task); -} -EXPORT_SYMBOL_GPL(nfs4_setup_sequence); - static int nfs4_sequence_process(struct rpc_task *task, struct nfs4_sequence_res *res) { return nfs40_sequence_done(task, res); @@ -1022,6 +990,22 @@ EXPORT_SYMBOL_GPL(nfs4_sequence_done); #endif /* !CONFIG_NFS_V4_1 */ +int nfs4_setup_sequence(const struct nfs_client *client, + struct nfs4_sequence_args *args, + struct nfs4_sequence_res *res, + struct rpc_task *task) +{ +#if defined(CONFIG_NFS_V4_1) + struct nfs4_session *session = nfs4_get_session(client); + + if (session) + return nfs41_setup_sequence(session, args, res, task); +#endif /* CONFIG_NFS_V4_1 */ + return nfs40_setup_sequence(client->cl_slot_tbl, args, res, task); + +} +EXPORT_SYMBOL_GPL(nfs4_setup_sequence); + static void nfs40_call_sync_prepare(struct rpc_task *task, void *calldata) { struct nfs4_call_sync_data *data = calldata; @@ -2046,8 +2030,8 @@ static void nfs4_open_confirm_prepare(struct rpc_task *task, void *calldata) { struct nfs4_opendata *data = calldata; - nfs40_setup_sequence(data->o_arg.server->nfs_client->cl_slot_tbl, - &data->c_arg.seq_args, &data->c_res.seq_res, task); + nfs4_setup_sequence(data->o_arg.server->nfs_client, + &data->c_arg.seq_args, &data->c_res.seq_res, task); } static void nfs4_open_confirm_done(struct rpc_task *task, void *calldata) @@ -6631,8 +6615,8 @@ static void nfs4_release_lockowner_prepare(struct rpc_task *task, void *calldata { struct nfs_release_lockowner_data *data = calldata; struct nfs_server *server = data->server; - nfs40_setup_sequence(server->nfs_client->cl_slot_tbl, - &data->args.seq_args, &data->res.seq_res, task); + nfs4_setup_sequence(server->nfs_client, &data->args.seq_args, + &data->res.seq_res, task); data->args.lock_owner.clientid = server->nfs_client->cl_clientid; data->timestamp = jiffies; } @@ -7822,7 +7806,7 @@ static void nfs4_get_lease_time_prepare(struct rpc_task *task, dprintk("--> %s\n", __func__); /* just setup sequence, do not trigger session recovery since we're invoked within one */ - nfs41_setup_sequence(data->clp->cl_session, + nfs4_setup_sequence(data->clp, &data->args->la_seq_args, &data->res->lr_seq_res, task); @@ -8193,7 +8177,7 @@ static void nfs41_sequence_prepare(struct rpc_task *task, void *data) args = task->tk_msg.rpc_argp; res = task->tk_msg.rpc_resp; - nfs41_setup_sequence(clp->cl_session, args, res, task); + nfs4_setup_sequence(clp, args, res, task); } static const struct rpc_call_ops nfs41_sequence_ops = { @@ -8281,7 +8265,7 @@ static void nfs4_reclaim_complete_prepare(struct rpc_task *task, void *data) { struct nfs4_reclaim_complete_data *calldata = data; - nfs41_setup_sequence(calldata->clp->cl_session, + nfs4_setup_sequence(calldata->clp, &calldata->arg.seq_args, &calldata->res.seq_res, task); @@ -8388,10 +8372,9 @@ nfs4_layoutget_prepare(struct rpc_task *task, void *calldata) { struct nfs4_layoutget *lgp = calldata; struct nfs_server *server = NFS_SERVER(lgp->args.inode); - struct nfs4_session *session = nfs4_get_session(server->nfs_client); dprintk("--> %s\n", __func__); - nfs41_setup_sequence(session, &lgp->args.seq_args, + nfs4_setup_sequence(server->nfs_client, &lgp->args.seq_args, &lgp->res.seq_res, task); dprintk("<-- %s\n", __func__); } @@ -8634,7 +8617,7 @@ nfs4_layoutreturn_prepare(struct rpc_task *task, void *calldata) struct nfs4_layoutreturn *lrp = calldata; dprintk("--> %s\n", __func__); - nfs41_setup_sequence(lrp->clp->cl_session, + nfs4_setup_sequence(lrp->clp, &lrp->args.seq_args, &lrp->res.seq_res, task); @@ -8784,9 +8767,8 @@ static void nfs4_layoutcommit_prepare(struct rpc_task *task, void *calldata) { struct nfs4_layoutcommit_data *data = calldata; struct nfs_server *server = NFS_SERVER(data->args.inode); - struct nfs4_session *session = nfs4_get_session(server->nfs_client); - nfs41_setup_sequence(session, + nfs4_setup_sequence(server->nfs_client, &data->args.seq_args, &data->res.seq_res, task); @@ -9110,7 +9092,7 @@ struct nfs_free_stateid_data { static void nfs41_free_stateid_prepare(struct rpc_task *task, void *calldata) { struct nfs_free_stateid_data *data = calldata; - nfs41_setup_sequence(nfs4_get_session(data->server->nfs_client), + nfs4_setup_sequence(data->server->nfs_client, &data->args.seq_args, &data->res.seq_res, task);