From patchwork Thu Nov 17 20:15:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Schumaker, Anna" X-Patchwork-Id: 9435289 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 4EC2F60469 for ; Thu, 17 Nov 2016 20:16:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2294C29648 for ; Thu, 17 Nov 2016 20:16:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 12FF8296CC; Thu, 17 Nov 2016 20:16:19 +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 B621C29648 for ; Thu, 17 Nov 2016 20:16:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751559AbcKQUQQ (ORCPT ); Thu, 17 Nov 2016 15:16:16 -0500 Received: from mx141.netapp.com ([216.240.21.12]:25474 "EHLO mx141.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751020AbcKQUQP (ORCPT ); Thu, 17 Nov 2016 15:16:15 -0500 X-IronPort-AV: E=Sophos;i="5.31,655,1473145200"; d="scan'208";a="163308754" Received: from hioexcmbx02-prd.hq.netapp.com ([10.122.105.35]) by mx141-out.netapp.com with ESMTP; 17 Nov 2016 12:15:53 -0800 Received: from VMWEXCCAS10-PRD.hq.netapp.com (10.122.105.28) by hioexcmbx02-prd.hq.netapp.com (10.122.105.35) with Microsoft SMTP Server (TLS) id 15.0.1210.3; Thu, 17 Nov 2016 12:16:13 -0800 Received: from NAM01-BY2-obe.outbound.protection.outlook.com (10.120.60.153) by VMWEXCCAS10-PRD.hq.netapp.com (10.122.105.28) with Microsoft SMTP Server (TLS) id 15.0.1210.3 via Frontend Transport; Thu, 17 Nov 2016 12:16:13 -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=2sKvV5s6hqTG1tmKx1GhfG76GX5vG8hFI9mn48zyeZM=; b=nfvZILzpNB/CE2LlbdkG66COMKeF3rXGV2EHoIHdtvDQsf7rKIBBhJdcEFIXlaTT4SI/NUkVAMFgHtvkpj7H/fzIL9+X0Q/D7yX5F9P2JK9miHhFCklWjVZV1taG4nw3OD38N7cE4PwIAPdX9u4WFBq6OAy1lDybGaiQFa/YfGY= 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.721.10; Thu, 17 Nov 2016 20:16:09 +0000 From: To: , CC: Subject: [PATCH] NFS: Remove unused authflavour parameter from nfs_get_client() Date: Thu, 17 Nov 2016 15:15:55 -0500 Message-ID: <20161117201555.10357-1-Anna.Schumaker@Netapp.com> X-Mailer: git-send-email 2.10.2 MIME-Version: 1.0 X-Originating-IP: [99.9.112.69] X-ClientProxiedBy: BLUPR14CA0017.namprd14.prod.outlook.com (10.163.77.155) To CY1PR0601MB1642.namprd06.prod.outlook.com (10.163.232.16) X-Microsoft-Exchange-Diagnostics: 1; CY1PR0601MB1642; 2:ebTEnMeTcWN8UBMueRkI7GgiQYMAw1bLImNWe9VBAjM4qYum1ymt7YV+J8l9yj3nVEDgj2lm2nsGAtyF2e3qFYpL9cccQlC0sblldCXPBxLw9xQtM2rQ03bT9isrwe8e902dwwstUnuGZIC9EW1Gx+hNCV1fZ0AKV+th7uFlg9w=; 3:daVLCjHl85FAr91z7y3KcxC6aKOBrvxQLGZbbEFo3PkCAZHUTEYCHCHI0R+kHi5XrYROAI8DGHgXOzanqqyKCqGv2peUWzacOJaV0SDxgXcaXT5T3jXQQlzF8LyWB/7rhaECl+g9W3Lhc1OvWDJE56SSY+dGzZjNA3qIYwGvyDE= X-MS-Office365-Filtering-Correlation-Id: c07de6c2-2cc0-46dd-2ac9-08d40f269226 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:CY1PR0601MB1642; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0601MB1642; 25:uKh3J76ZHfRPSx39O05LKqOu0gGmrA6jfaNLNzKWRjAm3H6UnvEVIydluhuDY2iLsYb8ra9Po1gSN6Z6CRBD3bJqNQ4dB0pq4+2FLIeZ3ZwQOggJylVVcWFEZIa5n8XTMC3dExVfYpBPzLr99m1pQDxmXlh7Q6EoL+m4jezNtCX+FZTR5k4XLTl6oPimWyrYlI/3B9ve28LPMILK1awJilzBiVc9sumkMn+IvWOR8da9kUcwj1b6VX8a1TCuSRIm5XXUoUyMOukeLsSUm9BG1KzcwG8MZ9FzeHHhAqH0zMjhizuL+LGEQBmITNJ365R9PbxBTZulxobbxGnnqz6To83Q67jYtK9NivC5L/aP4qNn3VxPbLdd+B/DCaSczCwOBTfcHPvZDczlanVMHTbx8eVgVtQhhrxFgNfC2J+Jn4qDKEjvfkyYAZT+G62G8RudzP/5/d3Zshm8qv0dt+ADfbm6rEzvpGeF13z+CAQhiewXtuV2Nxt53adkEO18E/urtpZwNpwL3ikvjrWPqOyIoC6tdtj3C2GWV5uisiuFwYcIDNxWln5wIEPkWLqFB/0tllMZflwLgENvl8WjGlZa2/XfI6W+uHz3FmuFu/hREVDsYstUg36LATzqY8ND9x6onKDGk7xcFU/+SyMaz0Q+3JzUffv+P8wVYcCs7ktgsq4PIB8db6xPf0zQen1GH54tfipi/4G/yKl14CzSwlAIdZ8ZMRuD1svhTTc+fz/m5N3vMzqddgHynpRjDA+tiOG3H6XVOF5o84tvPCTBpuDZQBUhyjWBS1NZobVtAz6MuEo= X-Microsoft-Exchange-Diagnostics: 1; CY1PR0601MB1642; 31:UKvtYBLOtJyIijxgjXdGsLPB0C2OluJYSAx01bQvKQAMnmE+E+6dVgIXfSs1Wu5TbEorK/gwzwuZbjF5AP5iFCz2iCUvdk5iU6Ihd++og2cTYU5MLuNFJF9j2TOpHUnhwsX2wbgReWntURv08SIgXv8UlpIah3BA4hgaOipA+D0/Dfz2g7aMHrUVkwe180MxvTHO5/ZMW8r0MVj/Qd9aU1ICX/gO9SE4kDzJ4JA6UIM4sjEpXsiSsNbxY0B8jxjYhcpAeQzZ1BFU/G1oFrJsnQ==; 20:lN6vd+vJFnWBlD5RUVTbcv4Y2UVruxZ4/sZF3LqokPZuwVQV0OP9+z3ouyEK8elmXHs49eQNlo+GB4Ckes+ejyuo2EPZf/wCRx7IYWI+8asYbHAQP/emc1yMphfN+f0kJrMsxuKfaWBbpyz86xF5LzpIjXnHB9/XMe1KepuZV3ca3d0bgoXTFYFtmA4Gk3EmPQSscQZ6e04COUFuRyyf3e5IINl3y+b/eFjl4Gvs+KEAYxy46B702LZdmF0g87DRqJrJutaZGE/ibX8wb/fjR5/d4sOtONvl9E4VFR3tLnsRMw10V5z5ahI3A+e0hchAiJhfJ75HmAQeLPExnrHfjSDsJGRnN+AdwA7oF8ogkn8OjPE1WyL/4Fg9W3sYJFMOShO4DQdIgly5bEkxSg/XmvWeD7SoRumOgoBElGQ9wLpwobtsHanUe11VcNjG7UctlpczErAmPsSnib4CwxEDumhkuH8CKkRb65j4uGQNg53HPGkYjfdUqxu2MM1XEU53 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(150554046322364)(21532816269658); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6060326)(6040281)(601004)(2401047)(8121501046)(5005006)(10201501046)(3002001)(6061324)(6041223)(6043046); SRVR:CY1PR0601MB1642; BCL:0; PCL:0; RULEID:; SRVR:CY1PR0601MB1642; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0601MB1642; 4:Vqrf2AI8OiykuTDd0U0/O7X9dBkOpfr98/NzftlCV/gE1/T0jwbh4RD/vKhjzIGHirl4iIzfn/xOrsNC2nkPoRMccT4L5Qn6E0shm35L2aOe1meWZfqSsdMYDN6I8E79cW8X+evqPfXN7jFtVbfdN6EHI4plZ2AWAmJSFHzXOVYnLHHJVnCT6Nm+QjiSNC9ZjmI7Gixj/u6lxW8zcG2qZ24m+Phc+hhNRtPyZDalxfkQ9ekSZmWhqZpX/6mqPFWjz9rBnaK90Rg0dlX4zCUZyeW0wGTpW5qvamdr5l+J4pfGTfthTUH759CqR6VWc9qu38eByz0hGIdWDKuYomtTBAbwbohT51oOjHYbVim68zvJytGaUYnExSLafIFUoS+FKJmmSLgWWrOyJaRFQv2cvk8d9PkC4zW90Yo6U8vi2ZaZeLJRA3sGv6GtyWt3WtyyfV0HS9D11V9GyfdMusUA8ONRZRDlEMH0mTSvO/IWhQtCMlIu/JeLIUkNKOlVpBwRrc27foeI8LLb21VFzLp/4AqVud0LB7gqMSoLh9afYuRFHi3TALegjom/aM0Wqn7w X-Forefront-PRVS: 01294F875B X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(7916002)(189002)(199003)(101416001)(7846002)(6666003)(50226002)(3846002)(6116002)(106356001)(36756003)(81166006)(107886002)(81156014)(105586002)(7736002)(92566002)(305945005)(50466002)(48376002)(5660300001)(42186005)(47776003)(5001770100001)(77096005)(189998001)(68736007)(97736004)(86362001)(1076002)(575784001)(2876002)(2906002)(4001430100002)(50986999)(5003940100001)(66066001)(4326007)(86152002)(8676002); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR0601MB1642; H:gouda.nowheycreamery.com.nowheycreamery.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A: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:NRESI881SSlMujpiDxQZA6eoY9QnjRmHAjhkbH+?= =?us-ascii?Q?bUYqQ+w7AHPseuvuiksaoXrpdgAaTvegDe+/27FcGbNvEJGP6ajKUhmDVpxc?= =?us-ascii?Q?+TdSAttQo+KYsMs7xfz5Ed3Cf2zJVzrOQjU2Aml2gYySPwX1bSHXAaCKFRgf?= =?us-ascii?Q?vAlhHmek6sKRNYlzoezRT/MCP6G3EOwRjjRCnGnareZa5mJ/zsUCL4fVZ5cB?= =?us-ascii?Q?Y5VUhtyka4EXXxoR9hkSxzojw38yx2tnrslVrnKIvPU7yXIt7EBiebuBswSD?= =?us-ascii?Q?xlPLxvjOoKmU50HriWFsffgUlac34ugIIZ2GfNhzMXjZaiNoPLX/dBJsdgft?= =?us-ascii?Q?DwpzN+vO7jlnTP0HnLw4BxxHnfsLcBwaKira86XPCNAIrwWCkv22F/DzGIH/?= =?us-ascii?Q?hC5ldGArOPkCG6hU1qYvrFROfT53qZavaI7tFwbVrIGA+z8LlRhQRRGMr0o2?= =?us-ascii?Q?Wejl6YigHRrT/e9Y1nyb6zjvDncXbHUarIkjnzu1okkaap486M9xtQvlrveR?= =?us-ascii?Q?5BPakBcYppByO1myvjqWCU4WOmswsMxbAXMPguiBqIeHLfXxeZvtysCOBLCD?= =?us-ascii?Q?hOiVv9lGWPhY+4Q15x18UJp7KVN4gi8T+PccbShTf2T9gNrH+pJ+OAsSC8vz?= =?us-ascii?Q?g9tdTQbs+q2lkTxIdE+52Ab84TEdJ1bHUzQulqSoeGFPfth/SU/ZmH95LK/7?= =?us-ascii?Q?HVfcAQ2RTKPzBgNWEQtG3hN4nFj7lBhtA1En0uvf1jHU6A0bWY1CeOv8R8HM?= =?us-ascii?Q?zEt59qIiiHaZaOclWOzzXu4o1JdLWImj5mqxW8y3VFQUq9IIU5Yho7Z5CcL1?= =?us-ascii?Q?W+PmOiAslwHKelJCaq3qKbxQB6sqKQOUIKIerx3dOv/78LXo1MqVWLAI6rQE?= =?us-ascii?Q?0XWYqA16wi2iQvOJ9JpBxM3okxLnSnu/XG68Kosryiecc3AvVMBwm1F1XfN3?= =?us-ascii?Q?fGcTWSXEMTa4Fc474oNzbIE+WGC6fVVU0XC/qm1AaO63ADwwyGD2lUg6r3cf?= =?us-ascii?Q?s1zOtBLRlaZTLnzUo9mmeEbvAMAagbqC4LxC2Y214JGvRNHphS0SJ10uyOR9?= =?us-ascii?Q?ohLt3Dgo=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR0601MB1642; 6:QmjmSWKzxRGc9uOANsqjHaAaLabDLlzEYRYyJ2hUlcK0TlmsrMPWKWhQYbJyHIqLSZ8HIkOeZCbLF6d7MdTDm4xzcbDXJWFiiEE1wP/B/8Hsx2g45BHVPOt5kqr6B0GxSrwCtO/wAs6xTG12UEGBlVHQIkC6JC+QVzCrJ7+Ui4uo///+sk3xX+DlPgqbUZpFFFKR3VSASwdpr/B/fPPQ0yfpikvo4WuiZb3TPTG5yDMH4YOQg146+4SGeYe+q25kRsgtW/S4351I9XJVaizJB503lsBQmgyVvHnSa4HH4UP+6zlYVgrCJCyL9T4BxZuX+KEFXBumxbRepHUOVhGYhiC9TBJmlcGSAzAdPuWUz0zsbT4PgIktcEiCUcrZqIF0; 5:z3TSFfee9dfrCZCKifkNlmmbNM/9KYneviCE789ePeh8naoqtX6gZhzJRq26vM8/5GJPn+biAcETaGVtoMa8eSGSPD0yRIooKAlf9oeS9mKsS8IN1Fk/xxWOp5UxTZ/PoKk+rwKtl3IEqPFv484BIA==; 24:1KHHajcDpirY8+Pk03yyr5H+h/CC000hrJImWQNLISoLINZhRcqXfmPSHf5BqZMo69NRIp/OMVsJKib/yYSvBoEYpwWIZF3+IPzRB7rQ1Ws= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY1PR0601MB1642; 7:Z3+oxTHtcWBV7H0yDCLF3Ieg2kNq/1N65QUi/piCyAOjVoCuRa2YWiD97ydbZ+a07GG/L++UGZaU6Vwj9PuEOqo4Rb7o7n4yXZe5MMD96cjacSiHRB83R29Kw85xZJxfqsk242jFA2Mt3NmY+zeeqkTAAa/xIDi5uHRxB3YTOXf+QL0U+t7BFYY1YyBTVBhEGpNAYalh5jywun1bmVvaVwy11U8jbCLQPEuiKamk/P/YVVUN3HkOCWQav3DP/GMQh1DoqdByKCxs3eagdFec2q7o2yFik/Zwo3zSzjc82e92ajD62IY1xOOw1ZTCSi0eftKWYNPsm3NmKLjOnHlpd/sEeQyCypohNXM4cyoFqBc= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Nov 2016 20:16:09.6317 (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 This parameter hasn't been used since f8407299 (Linux 3.11-rc2), so let's remove it from this function and callers. Signed-off-by: Anna Schumaker --- fs/nfs/client.c | 6 ++---- fs/nfs/filelayout/filelayoutdev.c | 3 +-- fs/nfs/flexfilelayout/flexfilelayoutdev.c | 3 +-- fs/nfs/internal.h | 8 +++----- fs/nfs/nfs3client.c | 5 ++--- fs/nfs/nfs4client.c | 10 +++------- fs/nfs/pnfs.h | 3 +-- fs/nfs/pnfs_nfs.c | 28 ++++++++++------------------ 8 files changed, 23 insertions(+), 43 deletions(-) diff --git a/fs/nfs/client.c b/fs/nfs/client.c index 5ac3e1d..e431b77 100644 --- a/fs/nfs/client.c +++ b/fs/nfs/client.c @@ -361,9 +361,7 @@ nfs_found_client(const struct nfs_client_initdata *cl_init, * Look up a client by IP address and protocol version * - creates a new record if one doesn't yet exist */ -struct nfs_client * -nfs_get_client(const struct nfs_client_initdata *cl_init, - rpc_authflavor_t authflavour) +struct nfs_client *nfs_get_client(const struct nfs_client_initdata *cl_init) { struct nfs_client *clp, *new = NULL; struct nfs_net *nn = net_generic(cl_init->net, nfs_net_id); @@ -642,7 +640,7 @@ static int nfs_init_server(struct nfs_server *server, set_bit(NFS_CS_NORESVPORT, &cl_init.init_flags); /* Allocate or find a client reference we can use */ - clp = nfs_get_client(&cl_init, RPC_AUTH_UNIX); + clp = nfs_get_client(&cl_init); if (IS_ERR(clp)) { dprintk("<-- nfs_init_server() = error %ld\n", PTR_ERR(clp)); return PTR_ERR(clp); diff --git a/fs/nfs/filelayout/filelayoutdev.c b/fs/nfs/filelayout/filelayoutdev.c index 4946ef4..a5589b7 100644 --- a/fs/nfs/filelayout/filelayoutdev.c +++ b/fs/nfs/filelayout/filelayoutdev.c @@ -279,8 +279,7 @@ nfs4_fl_prepare_ds(struct pnfs_layout_segment *lseg, u32 ds_idx) nfs4_pnfs_ds_connect(s, ds, devid, dataserver_timeo, dataserver_retrans, 4, - s->nfs_client->cl_minorversion, - s->nfs_client->cl_rpcclient->cl_auth->au_flavor); + s->nfs_client->cl_minorversion); out_test_devid: if (filelayout_test_devid_unavailable(devid)) diff --git a/fs/nfs/flexfilelayout/flexfilelayoutdev.c b/fs/nfs/flexfilelayout/flexfilelayoutdev.c index f7a3f6b..b220b44 100644 --- a/fs/nfs/flexfilelayout/flexfilelayoutdev.c +++ b/fs/nfs/flexfilelayout/flexfilelayoutdev.c @@ -393,8 +393,7 @@ nfs4_ff_layout_prepare_ds(struct pnfs_layout_segment *lseg, u32 ds_idx, nfs4_pnfs_ds_connect(s, ds, devid, dataserver_timeo, dataserver_retrans, mirror->mirror_ds->ds_versions[0].version, - mirror->mirror_ds->ds_versions[0].minor_version, - RPC_AUTH_UNIX); + mirror->mirror_ds->ds_versions[0].minor_version); /* connect success, check rsize/wsize limit */ if (ds->ds_clp) { diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h index 80bcc0b..4622d5f 100644 --- a/fs/nfs/internal.h +++ b/fs/nfs/internal.h @@ -154,8 +154,7 @@ extern const struct rpc_program nfs_program; extern void nfs_clients_init(struct net *net); extern struct nfs_client *nfs_alloc_client(const struct nfs_client_initdata *); int nfs_create_rpc_client(struct nfs_client *, const struct nfs_client_initdata *, rpc_authflavor_t); -struct nfs_client *nfs_get_client(const struct nfs_client_initdata *, - rpc_authflavor_t); +struct nfs_client *nfs_get_client(const struct nfs_client_initdata *); int nfs_probe_fsinfo(struct nfs_server *server, struct nfs_fh *, struct nfs_fattr *); void nfs_server_insert_lists(struct nfs_server *); void nfs_server_remove_lists(struct nfs_server *); @@ -194,14 +193,13 @@ extern struct nfs_client *nfs4_set_ds_client(struct nfs_server *mds_srv, int ds_addrlen, int ds_proto, unsigned int ds_timeo, unsigned int ds_retrans, - u32 minor_version, - rpc_authflavor_t au_flavor); + u32 minor_version); extern struct rpc_clnt *nfs4_find_or_create_ds_client(struct nfs_client *, struct inode *); extern struct nfs_client *nfs3_set_ds_client(struct nfs_server *mds_srv, const struct sockaddr *ds_addr, int ds_addrlen, int ds_proto, unsigned int ds_timeo, - unsigned int ds_retrans, rpc_authflavor_t au_flavor); + unsigned int ds_retrans); #ifdef CONFIG_PROC_FS extern int __init nfs_fs_proc_init(void); extern void nfs_fs_proc_exit(void); diff --git a/fs/nfs/nfs3client.c b/fs/nfs/nfs3client.c index ee75354..7879f2a 100644 --- a/fs/nfs/nfs3client.c +++ b/fs/nfs/nfs3client.c @@ -78,8 +78,7 @@ struct nfs_server *nfs3_clone_server(struct nfs_server *source, */ struct nfs_client *nfs3_set_ds_client(struct nfs_server *mds_srv, const struct sockaddr *ds_addr, int ds_addrlen, - int ds_proto, unsigned int ds_timeo, unsigned int ds_retrans, - rpc_authflavor_t au_flavor) + int ds_proto, unsigned int ds_timeo, unsigned int ds_retrans) { struct rpc_timeout ds_timeout; struct nfs_client *mds_clp = mds_srv->nfs_client; @@ -106,7 +105,7 @@ struct nfs_client *nfs3_set_ds_client(struct nfs_server *mds_srv, /* Use the MDS nfs_client cl_ipaddr. */ nfs_init_timeout_values(&ds_timeout, ds_proto, ds_timeo, ds_retrans); - clp = nfs_get_client(&cl_init, au_flavor); + clp = nfs_get_client(&cl_init); return clp; } diff --git a/fs/nfs/nfs4client.c b/fs/nfs/nfs4client.c index 074ac71..c5b7d5c 100644 --- a/fs/nfs/nfs4client.c +++ b/fs/nfs/nfs4client.c @@ -881,7 +881,6 @@ static int nfs4_set_client(struct nfs_server *server, const struct sockaddr *addr, const size_t addrlen, const char *ip_addr, - rpc_authflavor_t authflavour, int proto, const struct rpc_timeout *timeparms, u32 minorversion, struct net *net) { @@ -907,7 +906,7 @@ static int nfs4_set_client(struct nfs_server *server, set_bit(NFS_CS_MIGRATION, &cl_init.init_flags); /* Allocate or find a client reference we can use */ - clp = nfs_get_client(&cl_init, authflavour); + clp = nfs_get_client(&cl_init); if (IS_ERR(clp)) { error = PTR_ERR(clp); goto error; @@ -948,7 +947,7 @@ static int nfs4_set_client(struct nfs_server *server, struct nfs_client *nfs4_set_ds_client(struct nfs_server *mds_srv, const struct sockaddr *ds_addr, int ds_addrlen, int ds_proto, unsigned int ds_timeo, unsigned int ds_retrans, - u32 minor_version, rpc_authflavor_t au_flavor) + u32 minor_version) { struct rpc_timeout ds_timeout; struct nfs_client *mds_clp = mds_srv->nfs_client; @@ -979,7 +978,7 @@ struct nfs_client *nfs4_set_ds_client(struct nfs_server *mds_srv, * (section 13.1 RFC 5661). */ nfs_init_timeout_values(&ds_timeout, ds_proto, ds_timeo, ds_retrans); - clp = nfs_get_client(&cl_init, au_flavor); + clp = nfs_get_client(&cl_init); dprintk("<-- %s %p\n", __func__, clp); return clp; @@ -1103,7 +1102,6 @@ static int nfs4_init_server(struct nfs_server *server, (const struct sockaddr *)&data->nfs_server.address, data->nfs_server.addrlen, data->client_address, - data->selected_flavor, data->nfs_server.protocol, &timeparms, data->minorversion, @@ -1200,7 +1198,6 @@ struct nfs_server *nfs4_create_referral_server(struct nfs_clone_mount *data, data->addr, data->addrlen, parent_client->cl_ipaddr, - data->authflavor, rpc_protocol(parent_server->client), parent_server->client->cl_timeout, parent_client->cl_mvops->minor_version, @@ -1311,7 +1308,6 @@ int nfs4_update_server(struct nfs_server *server, const char *hostname, nfs_server_remove_lists(server); error = nfs4_set_client(server, hostname, sap, salen, buf, - clp->cl_rpcclient->cl_auth->au_flavor, clp->cl_proto, clnt->cl_timeout, clp->cl_minorversion, net); nfs_put_client(clp); diff --git a/fs/nfs/pnfs.h b/fs/nfs/pnfs.h index 5c29551..f6d456b 100644 --- a/fs/nfs/pnfs.h +++ b/fs/nfs/pnfs.h @@ -362,8 +362,7 @@ struct nfs4_pnfs_ds *nfs4_pnfs_ds_add(struct list_head *dsaddrs, void nfs4_pnfs_v3_ds_connect_unload(void); void nfs4_pnfs_ds_connect(struct nfs_server *mds_srv, struct nfs4_pnfs_ds *ds, struct nfs4_deviceid_node *devid, unsigned int timeo, - unsigned int retrans, u32 version, u32 minor_version, - rpc_authflavor_t au_flavor); + unsigned int retrans, u32 version, u32 minor_version); struct nfs4_pnfs_ds_addr *nfs4_decode_mp_ds_addr(struct net *net, struct xdr_stream *xdr, gfp_t gfp_flags); diff --git a/fs/nfs/pnfs_nfs.c b/fs/nfs/pnfs_nfs.c index 53b4705..9414b49 100644 --- a/fs/nfs/pnfs_nfs.c +++ b/fs/nfs/pnfs_nfs.c @@ -600,8 +600,7 @@ static struct nfs_client *(*get_v3_ds_connect)( int ds_addrlen, int ds_proto, unsigned int ds_timeo, - unsigned int ds_retrans, - rpc_authflavor_t au_flavor); + unsigned int ds_retrans); static bool load_v3_ds_connect(void) { @@ -625,15 +624,13 @@ EXPORT_SYMBOL_GPL(nfs4_pnfs_v3_ds_connect_unload); static int _nfs4_pnfs_v3_ds_connect(struct nfs_server *mds_srv, struct nfs4_pnfs_ds *ds, unsigned int timeo, - unsigned int retrans, - rpc_authflavor_t au_flavor) + unsigned int retrans) { struct nfs_client *clp = ERR_PTR(-EIO); struct nfs4_pnfs_ds_addr *da; int status = 0; - dprintk("--> %s DS %s au_flavor %d\n", __func__, - ds->ds_remotestr, au_flavor); + dprintk("--> %s DS %s\n", __func__, ds->ds_remotestr); if (!load_v3_ds_connect()) goto out; @@ -657,7 +654,7 @@ static int _nfs4_pnfs_v3_ds_connect(struct nfs_server *mds_srv, clp = get_v3_ds_connect(mds_srv, (struct sockaddr *)&da->da_addr, da->da_addrlen, IPPROTO_TCP, - timeo, retrans, au_flavor); + timeo, retrans); } if (IS_ERR(clp)) { @@ -676,15 +673,13 @@ static int _nfs4_pnfs_v4_ds_connect(struct nfs_server *mds_srv, struct nfs4_pnfs_ds *ds, unsigned int timeo, unsigned int retrans, - u32 minor_version, - rpc_authflavor_t au_flavor) + u32 minor_version) { struct nfs_client *clp = ERR_PTR(-EIO); struct nfs4_pnfs_ds_addr *da; int status = 0; - dprintk("--> %s DS %s au_flavor %d\n", __func__, ds->ds_remotestr, - au_flavor); + dprintk("--> %s DS %s\n", __func__, ds->ds_remotestr); list_for_each_entry(da, &ds->ds_addrs, da_node) { dprintk("%s: DS %s: trying address %s\n", @@ -720,8 +715,7 @@ static int _nfs4_pnfs_v4_ds_connect(struct nfs_server *mds_srv, clp = nfs4_set_ds_client(mds_srv, (struct sockaddr *)&da->da_addr, da->da_addrlen, IPPROTO_TCP, - timeo, retrans, minor_version, - au_flavor); + timeo, retrans, minor_version); if (IS_ERR(clp)) continue; @@ -755,19 +749,17 @@ static int _nfs4_pnfs_v4_ds_connect(struct nfs_server *mds_srv, */ void nfs4_pnfs_ds_connect(struct nfs_server *mds_srv, struct nfs4_pnfs_ds *ds, struct nfs4_deviceid_node *devid, unsigned int timeo, - unsigned int retrans, u32 version, - u32 minor_version, rpc_authflavor_t au_flavor) + unsigned int retrans, u32 version, u32 minor_version) { if (test_and_set_bit(NFS4DS_CONNECTING, &ds->ds_state) == 0) { int err = 0; if (version == 3) { err = _nfs4_pnfs_v3_ds_connect(mds_srv, ds, timeo, - retrans, au_flavor); + retrans); } else if (version == 4) { err = _nfs4_pnfs_v4_ds_connect(mds_srv, ds, timeo, - retrans, minor_version, - au_flavor); + retrans, minor_version); } else { dprintk("%s: unsupported DS version %d\n", __func__, version);