From patchwork Wed Jan 11 18:54:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Schumaker, Anna" X-Patchwork-Id: 9511035 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 8143360710 for ; Wed, 11 Jan 2017 18:55:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 757F22866E for ; Wed, 11 Jan 2017 18:55:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6A4C328675; Wed, 11 Jan 2017 18:55:15 +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 DC99F2866E for ; Wed, 11 Jan 2017 18:55:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753279AbdAKSzM (ORCPT ); Wed, 11 Jan 2017 13:55:12 -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 S1753264AbdAKSzK (ORCPT ); Wed, 11 Jan 2017 13:55:10 -0500 X-IronPort-AV: E=Sophos;i="5.33,346,1477983600"; d="scan'208";a="175756373" Received: from hioexcmbx06-prd.hq.netapp.com ([10.122.105.39]) by mx141-out.netapp.com with ESMTP; 11 Jan 2017 10:50:27 -0800 Received: from VMWEXCCAS12-PRD.hq.netapp.com (10.122.105.30) by hioexcmbx06-prd.hq.netapp.com (10.122.105.39) with Microsoft SMTP Server (TLS) id 15.0.1210.3; Wed, 11 Jan 2017 10:55:06 -0800 Received: from NAM03-DM3-obe.outbound.protection.outlook.com (10.120.60.153) by VMWEXCCAS12-PRD.hq.netapp.com (10.122.105.30) with Microsoft SMTP Server (TLS) id 15.0.1210.3 via Frontend Transport; Wed, 11 Jan 2017 10:55:06 -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=RZDGKRHX58W5fbu1Bubtz7YxGS73cYQAGG7sJmoEnO8=; b=IXjuBMykRgzmlWYlHrwVnuASv+x05DUTqRz3+punMy70JI0pUwGwK78AbAWT4Grbm8kQP7DlDMCNIyEttx8W5Wof/mUsvTcKPmCBTBGHABEBDbeyfS3FFbaTkiwL6ypDv8mE9hFjg5aSxYtpF2vT2sUXHW09welyR8thiC+ZWkE= 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:05 +0000 From: To: Subject: [PATCH 03/11] NFS: Change nfs4_setup_sequence() to take an nfs_client structure Date: Wed, 11 Jan 2017 13:54:46 -0500 Message-ID: <20170111185454.9315-4-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: f218a931-ca17-4b54-9e42-08d43a535b9a X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:CY1PR0601MB1642; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0601MB1642; 3:jdDAOiw66K+3zc33nEc2o6Gx4k9O+oPcQGzufHlSzFls0U2Q399V5rscqyduME+SMzBGNuEs7fTUGB/yAR2szhy8EYaIDmyInc/6IYK0ZHJmnJy5HWElERPBvMOcWM5AzX0PiiBzEAsxYjibaS3eFIRK/89D41OB0yPU/yVKJDz96S1ds0A9P8z6oLFcjlqnV0APl8p5JJFFAKewWjXls2cOjO7Y3gpr6hsp9f0CfsRHxRhvbeSifyNuEVn/UDufWDat/Ts4YC3TwQQgkbGs6A==; 25:8nX6NdMi+F/Xope/BGjBRywxnvROptJ/Nam6DutkNon3VMug+D5rxcWk+c5dfhmcJJb0orU7K+8c31cRszLb8yB+kE7U5ouzjlee2RSDD0WTasUzXTkqhC7Ky+JF3Rw+eUtN5Q1VixLHoi+n1VwWgaaw41IF602cwSK5bqBo0vzIWOTZgmCYnIi9YsqJXIneFbooD4P3BRLS6ZS+8TTFnpd7iITsVNTOKTBRE5bJGoOELQns6wczDCSN7HDoxk7K8okrrBSTPeloU91gEpUmOcDvJ6vlbXrXp/VYfMP7YC0TB/wmU3USAdnH8+lxnN5qCC0MiTC4j0DGFQwHUdKi8pf7EzKP61aF2zCIDftm1GH1zucTEGxF7njDgvAH233qK94Dkx3/laWBz5hpVyp+wNxvGl7aymQe/7sIfIsxUuOENtLvB6JhZBjG/tDMXib5B0m3gp7OtCCc5SPyz6lXJA== X-Microsoft-Exchange-Diagnostics: 1; CY1PR0601MB1642; 31:5FDG8bzKqUr+/irFSsXE+NXT/BmUm78bS7e5XbGn640XfghbJsP9xhdokRdkCoP/Rgz6lOv/JRKUmbqjL5IjlBn1jpdISavuiZOEkv3+jML7w7EwOix76qKPT7jE20kxQAC6oZh3jZXRpjXGETcntNKgSlGZTZsqml5dno9DDh5INHG0xxA7RmILM7qVe+kyyxCWQlaJcQI4tf1XqA1pjUzWZjQ5H7YGyK9CsDpIW9vpmmAqaKewAGZi+x+B4wko92FY5q9M1iaKR0fWHCGdV5ZxKdHiyGnQzEGCg+pQMww=; 20:fk+sQ9tj/kzueNjMgkwaqtQY3dXrcmBrSUgTVETAyKZGgtiXdwPNjwsDOGCMGG0a1JJ0YSqcXgSozxr6FdxI3nlQkhQK56pgU2MBMOtQHW3rL1rhdTRbzpAeX0mpfdndwN0mdYaSCZrc6yVgdhNdgFEz8hargbPu+puouA6Eoq4YaJaYd6BgGY7jGa4bSAtvrwz0Wpte3ISwjHCcurQtE8bRanpTrHVXYo/81ruH1uQ93hSbAEeEZAZCZR6/CW0jd6s1cpuuS8wMypvFLMdQVmZ4qv0AOj58sGDeqiR647DkqbTcHaT2ar2Nn0qolk5yxX2IpPlLy421v7lkRLGz8/tZvQqQ/ag9i1FX/fQezBpbzqwIvd6lQJ5XMS8jeSS1vh+VPRI7xIE2nJEtK7ehK/xGtvkGTJFRQmZbKgyNbdRmzfWEu8g/i2fag4G7QBjxOV1mJUqu9gbrKOOAn3y++8Gy/kFZGvy9WlQZPoJV7kenAPRmvwRENPbDYFAwZXCN 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:D1MyNsU7cTOAHBlFoDtwyDimOk1tPjLcUYw8WlJzjvvFhlVl1S9v3oJEjxs6i1nWj/apyC7DiCjVTRV/QB8GZRkmL++oxy1xpTQCBNDCLKx1T2j+zM5E9RCCorItV3buOq/OIT8pNpQcSqdWTw7vilIrHfkF4+zZO1bav7wNWEMmn0F9R0rzb2jfwwGaWcWDdGz6+Pdxxjs+cxZe5Z2/8qcpwztY0hMS958y3q7M7LreLjdSkFQHpKEhaNcyc7OK6lAwPATrQeBmxh3x1QUi0ses4gnYInYofP+32ILDTbDl0rd69dsIXFe/3KFqplo7pGtLvTNq/ZIEZjut8+WqP8DJrveul2Ry2BBa7tCVozXVRdzsGHwWiDKtUhe81LCt50TwILexqWDkQQYVWsh6MoO7fokYLtOtNHDGZwKgyb0EcBG5qYiylZW9MwPnfPT2xa+gpeofLJeK/dZsTHzLE0XGCT+lOCX1OxR1h9AZnSp9GPsjoTYhT1uh+rRvdIa9fJn/9XEWkBRY6fMzW8XUH5hDgQE0XJoprx/YQ9qCIgfA8ogdp6m56ukXB7BZwewuCqMXirHIPURd2+znHUEFI5TnAk2WNR+LtoilnVBUM/DGwrdHaRj97wqUDxtsG0XFmLgKcaEUO5HVWRnANn3Bpg== 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)(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:H5Cv5K2ZpAIgZ+M7UQ+u08/DFP30uyc+iHo9Ntq?= =?us-ascii?Q?SzJHajaMU5ZkJkVm9AtmhGERBcSCCFzzXrkrHfEUO89/5oky6+SasvyKLDDz?= =?us-ascii?Q?lUEab7pi5Kukz71NI8mL/PFGaXOtlk1bc4B6gnrmb3iI+2Hkuq2C/2EfP2MU?= =?us-ascii?Q?lMd3XT+m9xKjB2zw2YBjfR6/GP19G1Ms0iPzxfAq//HLD1cw/PgJAozP03/2?= =?us-ascii?Q?y6RALjUhuUM92U/TNG/dImkLxl3d9txbQbfYJ4pMsAFvC7d86QOdUsSmCKFC?= =?us-ascii?Q?fVHPfrNehiYyL2kIIHP8EI+6pJP2g/nNVle+A7HYqGL1PRlq/3vzzOY0GX8Q?= =?us-ascii?Q?+seIv21Omo5FYMRQlLtRf9Xv4UmlCto7MgQ9hkcexZuLWxe5MJYv4AjXRjKK?= =?us-ascii?Q?AQ382lXpOjBHr+nwnNce7vS6W5J9Uru3aixf8M5uZBg60FXqJx5GDOocnP/g?= =?us-ascii?Q?pYRaHbuvj2JklJO5k9VCBa5D4aXwG1QSbx/2Q9C1huf4ST+EVhEkbBHd/lXz?= =?us-ascii?Q?OlMib9pKp9bAm5RSTYswmEABUHI7LKCSsOECWETeA8RVHIDWCbNmtt1YR5V1?= =?us-ascii?Q?mz6fyUddHiB4gYGkifsjHRB1z9qQ6Z1+sUlhGLa0JCuCk2AbT5AMEOaSkrzX?= =?us-ascii?Q?pAzyGZag/FasJZV5y+Katu+ylCFT3clEtZWNCq2hugQkEVh+CliXO1efbZbe?= =?us-ascii?Q?7Gb9X1LJOJphxGo5lfiRyXHh3/+lTuqsdUKmJE6DxnaG/foc6AB9bZG22ZOc?= =?us-ascii?Q?kJwmnbxnkQshEuf+X6G1tsmsmkomfuLmnmo511XcadjIYQZXJQD+PdGCsbxb?= =?us-ascii?Q?eD9+WZI6YQxR77IojEaQmtGV9IsSQWtmu/f1Bl4BFQdUJIzhU6RKl8spxaI5?= =?us-ascii?Q?5dSikzXgXezp9IM+zkZ0EunYUFEHvrBNkJm6muPlp0USQYBlxj5B6yc6pr2E?= =?us-ascii?Q?A5zTVP1xVyud3JxzhVaaaCPsGz5vQHjafg+6WMNK8RVtxjd6zUFRv96oNSMX?= =?us-ascii?Q?jzeCBMFqHDYb+INfRz062jG0CyBOvoOEs+PnTmpbTtx/KrqkuZ6i1sVVVcVn?= =?us-ascii?Q?ej9l/VgrUvURKNPj7FJK8K8I4EP1g51z+0oKzk7qYg3X6nDvs9DPM98d4Abi?= =?us-ascii?Q?DxKZMvF4Gk1rqXurwDTpq5unkQRYVnYxNiBKdDDRp9sFGj7pEcwDCJ0JmZ7J?= =?us-ascii?Q?mT+n6E4rhf1BvC48=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR0601MB1642; 6:UjMs+qijQmCj9AytGFH7iesQCgSl5BZTBHoM1NobnJJNGJe4pzanHF/ywbcD5fLLhLC6FzMfQwwyCfCCGrXWOqnwVPzBUAXDY3j24zQZzwg0c50Nezdy5vuJtRhNjJ20kzm89voen9DkbGHQlCrwr0X2jopWT28dj7c6D1o5EARvJJL1IUGB26WFWCDE+OfAk4iA+jrx0xau/V1JEgsEkD3Jkz6jLi520gRgwsVgQUTTJrwFXo+ssQkFks4qv90d8PvYRb+M5hw6NZWEM1Ja47Zx9EpQitEgy48mT3/imAybq0XbT2pHcKvSWHWxM2LZosUAtNac2kihh3YOGuDbJWJW7873YtQGJteRFNVLO8a/Yxe9cTSNuv7EegxdKCwSFZUU0Q8v5FjcJgZbqpEVDtAnkdYNm9I+pP4hLmI0/cE=; 5:tvlLX0z3Bw7ddaw32LU4lTF3xX3Yy4Gw6FAkRhItf7AqcfApWCyAWTW+b/fykfwj1x/g5ZIiZ4sWBeDk8/U6xKhG7YlkfKB1cWqkXBjW6ukl802fElpG0zaQvsTM5jqDnjiD9XYa+HkYcNIfRn0yyw==; 24:LkXm5Mc3GVnLb5+f4rdGfe4YCS/TTVjTNVjBCb/vbT56glypH/rhAM+AI1Y/abjmsmwrRb2xZLm63ksb4LOXNGv5uOcB3JDvuRkGcn/dY5Y= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY1PR0601MB1642; 7:HkiYaefo7ciI3GDpZp0jBn4erLTEORiozWJptCSJQuyAxSIQYKQrkx88Wv3gJuYrmhAu4zokI6F6eh1oPjIrBxbW/vt+QWOo8UqmDwel+0jTetGoiLHOz0omm5BXrycS/AoO9khcZuNpJcg2wsgj00NpO9Q7jZhoK8A9NLC2ohcDNeCLLO1haDA5O5gtmLnlXeLw2hdMUlXONlsuG1ET7fxlLdKl2ygGOOyYYRRCVyF85LaFFVBULq6Iuk1YbL52T+XB1CU5qQ412VK9B8BfsGeqp5qazuFP32WYsx50sc+KijDR/SNUqNMqMebgGiIElH4awzLWXgeExmEc6MvCAkO28g8+vHoK/V5Mw/QltqFpnE6TeFkzQv/9/OTPaeVEfXY5ZUV85zrSIJh0AAg7CGx2CLxMCJH2VIY/M1CtaGjjdA0myNGhOodyqHW4l2fkKLRVbZMVoyrbGHjFLjlGLw== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jan 2017 18:55:05.7427 (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 I want to have all callers use this function, rather than calling the NFS v4.0 and v4.1 versions directly. This includes pNFS, which only has access to the nfs_client structure in some places. Signed-off-by: Anna Schumaker --- fs/nfs/nfs4proc.c | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index d1fde35bfd7e..a2e5c6f39182 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -948,16 +948,16 @@ int nfs41_setup_sequence(struct nfs4_session *session, } EXPORT_SYMBOL_GPL(nfs41_setup_sequence); -static int nfs4_setup_sequence(const struct nfs_server *server, +static 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(server->nfs_client); + struct nfs4_session *session = nfs4_get_session(client); int ret = 0; if (!session) - return nfs40_setup_sequence(server->nfs_client->cl_slot_tbl, + return nfs40_setup_sequence(client->cl_slot_tbl, args, res, task); dprintk("--> %s clp %p session %p sr_slot %u\n", @@ -994,13 +994,12 @@ static const struct rpc_call_ops nfs41_call_sync_ops = { #else /* !CONFIG_NFS_V4_1 */ -static int nfs4_setup_sequence(const struct nfs_server *server, +static 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(server->nfs_client->cl_slot_tbl, - args, res, task); + return nfs40_setup_sequence(client->cl_slot_tbl, args, res, task); } static int nfs4_sequence_process(struct rpc_task *task, struct nfs4_sequence_res *res) @@ -1026,7 +1025,7 @@ EXPORT_SYMBOL_GPL(nfs4_sequence_done); static void nfs40_call_sync_prepare(struct rpc_task *task, void *calldata) { struct nfs4_call_sync_data *data = calldata; - nfs4_setup_sequence(data->seq_server, + nfs4_setup_sequence(data->seq_server->nfs_client, data->seq_args, data->seq_res, task); } @@ -2171,7 +2170,7 @@ static void nfs4_open_prepare(struct rpc_task *task, void *calldata) nfs_copy_fh(&data->o_res.fh, data->o_arg.fh); } data->timestamp = jiffies; - if (nfs4_setup_sequence(data->o_arg.server, + if (nfs4_setup_sequence(data->o_arg.server->nfs_client, &data->o_arg.seq_args, &data->o_res.seq_res, task) != 0) @@ -3230,7 +3229,7 @@ static void nfs4_close_prepare(struct rpc_task *task, void *data) else if (calldata->arg.bitmask == NULL) calldata->res.fattr = NULL; calldata->timestamp = jiffies; - if (nfs4_setup_sequence(NFS_SERVER(inode), + if (nfs4_setup_sequence(NFS_SERVER(inode)->nfs_client, &calldata->arg.seq_args, &calldata->res.seq_res, task) != 0) @@ -4109,7 +4108,7 @@ static void nfs4_proc_unlink_setup(struct rpc_message *msg, struct inode *dir) static void nfs4_proc_unlink_rpc_prepare(struct rpc_task *task, struct nfs_unlinkdata *data) { - nfs4_setup_sequence(NFS_SB(data->dentry->d_sb), + nfs4_setup_sequence(NFS_SB(data->dentry->d_sb)->nfs_client, &data->args.seq_args, &data->res.seq_res, task); @@ -4142,7 +4141,7 @@ static void nfs4_proc_rename_setup(struct rpc_message *msg, struct inode *dir) static void nfs4_proc_rename_rpc_prepare(struct rpc_task *task, struct nfs_renamedata *data) { - nfs4_setup_sequence(NFS_SERVER(data->old_dir), + nfs4_setup_sequence(NFS_SERVER(data->old_dir)->nfs_client, &data->args.seq_args, &data->res.seq_res, task); @@ -4713,7 +4712,7 @@ static void nfs4_proc_read_setup(struct nfs_pgio_header *hdr, static int nfs4_proc_pgio_rpc_prepare(struct rpc_task *task, struct nfs_pgio_header *hdr) { - if (nfs4_setup_sequence(NFS_SERVER(hdr->inode), + if (nfs4_setup_sequence(NFS_SERVER(hdr->inode)->nfs_client, &hdr->args.seq_args, &hdr->res.seq_res, task)) @@ -4812,7 +4811,7 @@ static void nfs4_proc_write_setup(struct nfs_pgio_header *hdr, static void nfs4_proc_commit_rpc_prepare(struct rpc_task *task, struct nfs_commit_data *data) { - nfs4_setup_sequence(NFS_SERVER(data->inode), + nfs4_setup_sequence(NFS_SERVER(data->inode)->nfs_client, &data->args.seq_args, &data->res.seq_res, task); @@ -5737,7 +5736,7 @@ static void nfs4_delegreturn_prepare(struct rpc_task *task, void *data) if (!d_data->lr.roc && nfs4_wait_on_layoutreturn(d_data->inode, task)) return; - nfs4_setup_sequence(d_data->res.server, + nfs4_setup_sequence(d_data->res.server->nfs_client, &d_data->args.seq_args, &d_data->res.seq_res, task); @@ -5979,7 +5978,7 @@ static void nfs4_locku_prepare(struct rpc_task *task, void *data) goto out_no_action; } calldata->timestamp = jiffies; - if (nfs4_setup_sequence(calldata->server, + if (nfs4_setup_sequence(calldata->server->nfs_client, &calldata->arg.seq_args, &calldata->res.seq_res, task) != 0) @@ -6165,7 +6164,7 @@ static void nfs4_lock_prepare(struct rpc_task *task, void *calldata) goto out_release_open_seqid; } data->timestamp = jiffies; - if (nfs4_setup_sequence(data->server, + if (nfs4_setup_sequence(data->server->nfs_client, &data->arg.seq_args, &data->res.seq_res, task) == 0)