Received: by 2002:ac0:aa62:0:0:0:0:0 with SMTP id w31-v6csp1951982ima; Thu, 25 Oct 2018 07:29:22 -0700 (PDT) X-Google-Smtp-Source: AJdET5eEoIrex52u5y3TvRZ2WxA/f6ffEyjfNUIp413tUXO5fMzRDYPZhAqvQqozv43E0BZsSZRz X-Received: by 2002:a17:902:6a8b:: with SMTP id n11-v6mr1731521plk.16.1540477762224; Thu, 25 Oct 2018 07:29:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1540477762; cv=none; d=google.com; s=arc-20160816; b=CJVK+g0Idtbo7gt0rS+pk+o0lbE3XohmKWGwqZaJNaT7F4kd4sepHf6LWwsJsavJK4 sK7qtG80dVNSuW3nM/JqWNMcMw5XpxUOXR3wcR6GB/aPG61T9COltdocVTXqZ7mTmj5O izXmh0DP/zLAednli01F41bU58AInxmU3A84tOQ+v69PNua8gVjK+mK9T8XjHecq4Bjr SSPQZVpuDDHE2A3TMq93IP5xU74oXdSXBVHwLwaIJgkCdVKWQFFmdRipqbuXh4yfwKpU BiOGL/fv3G6yAxbmfDD44DfCdqhrmOxiGr/FRw+1xKvusUeUjdhvA0aFksvkKfvst037 4ekw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=K5lsSa2uTnAh3SjqT30UyjrnI+KGr/dl/h3dXMRfMXo=; b=KqkXSQ2JPF37BLfVMEy+/NDizpv9wqZxtkCLtQAY4+FChz0hj01Ha+H+JK1uCZIOgP Xi0biK9WaydePtaUZb+RuoJ0uiB7Fy2rIJpLKci8sh2s7QsZ1A+vZu2NXkKSBcrdcXXu cRb9tSIMLvyipJCkcpYAq3xf2/908TKAnko16GbR2Y2HWntSKREWTy8UkWLUxw9FZmGe 6BG6uL+DXloKNaIG6xHBEkRCy4DYDANAE0vdUvMKtALl+5ZXu1zdlwjA231x9CsqIgu4 hp7NcAjrCT4RhoFPrP0WPKzxR8IuWl+KwB3fO3B1woegSX3yLIi1YhG5FAqJQ9I9SPTx DxoA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=gEUGucry; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n18-v6si7937648plp.294.2018.10.25.07.28.51; Thu, 25 Oct 2018 07:29:22 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=gEUGucry; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730608AbeJYWwd (ORCPT + 99 others); Thu, 25 Oct 2018 18:52:33 -0400 Received: from mail.kernel.org ([198.145.29.99]:34590 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730593AbeJYWwb (ORCPT ); Thu, 25 Oct 2018 18:52:31 -0400 Received: from sasha-vm.mshome.net (unknown [167.98.65.38]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9E4E82147A; Thu, 25 Oct 2018 14:19:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1540477174; bh=tfkPTFlnQElKZ8e73xkZntF0MimM3JHWkTahmmnhUuY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gEUGucrysXwJA3RVexs/wO/FhxNy2deT0jjh26jtMcgyCE1KjYdK8jn5U53uGEROj P35xHrr04tVJ8EHaGDSt8NI72+DeRoOh9l1ZqnSyIP9tB+qz4uGZeUgeuwzWKt5XAY HA5MyYDF4LkbweoV+oHYl18khG9AIais/Zgxc7Nc= From: Sasha Levin To: stable@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Chuck Lever , Trond Myklebust , Sasha Levin Subject: [PATCH AUTOSEL 3.18 26/98] NFS: Ignore transport protocol when detecting server trunking Date: Thu, 25 Oct 2018 10:17:41 -0400 Message-Id: <20181025141853.214051-26-sashal@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181025141853.214051-1-sashal@kernel.org> References: <20181025141853.214051-1-sashal@kernel.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Chuck Lever [ Upstream commit 7a01edf0058df98d6cc734c5a4ecc51f929a86ec ] Detect server trunking across transport protocols. Otherwise, an RDMA mount and a TCP mount of the same server will end up with separate nfs_clients using the same clientid4. Reported-by: Dai Ngo Signed-off-by: Chuck Lever Signed-off-by: Trond Myklebust Signed-off-by: Sasha Levin --- fs/nfs/nfs4client.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/fs/nfs/nfs4client.c b/fs/nfs/nfs4client.c index a8a9be4c6cf4..eb8777eb4d2b 100644 --- a/fs/nfs/nfs4client.c +++ b/fs/nfs/nfs4client.c @@ -495,9 +495,6 @@ int nfs40_walk_client_list(struct nfs_client *new, if (pos->rpc_ops != new->rpc_ops) continue; - if (pos->cl_proto != new->cl_proto) - continue; - if (pos->cl_minorversion != new->cl_minorversion) continue; @@ -633,9 +630,6 @@ int nfs41_walk_client_list(struct nfs_client *new, if (pos->rpc_ops != new->rpc_ops) continue; - if (pos->cl_proto != new->cl_proto) - continue; - if (pos->cl_minorversion != new->cl_minorversion) continue; -- 2.17.1