From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,T_DKIMWL_WL_HIGH autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 00F35C28EBD for ; Sun, 9 Jun 2019 09:44:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CAE35208E4 for ; Sun, 9 Jun 2019 09:44:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560073484; bh=OI5tl5rHJnuM1Q/rF/Am3NaGj385k9TGd0KV+6SkKrc=; h=Subject:To:Cc:From:Date:List-ID:From; b=2NkfzkwF17Ii/rAn4lP49TXbFhw9xVoQFIxOONG89ZG1nwxBdRO2YEDYfbNo/apFv /NQq65wscax1SLJ76PDZaG/HAMztIo5eumymkBD6SMTaThsERNlTAlNJpF4Bi8sscN 2HsLF4DJ7+y8uS+4L5wd7EXbMR1wMlXpRJZlm6zo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728014AbfFIJon (ORCPT ); Sun, 9 Jun 2019 05:44:43 -0400 Received: from wout5-smtp.messagingengine.com ([64.147.123.21]:57465 "EHLO wout5-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727979AbfFIJon (ORCPT ); Sun, 9 Jun 2019 05:44:43 -0400 Received: from compute6.internal (compute6.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id 353E53D4; Sun, 9 Jun 2019 05:44:42 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Sun, 09 Jun 2019 05:44:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=aTe3+a si2nqE1V6A/GIG8XwFPoGtjh7Xuh564YvyRmg=; b=frQTY4AUp59Y3MhNink1vD u71pP95yFswdlzEhtAPcqLlTrwDZi0FFcRx/xa/9BHE0QKsDHW1cNwf3tFGXQKx+ X9GG8QLjtx7+SjrXoycV+BM8qDfiRszAitl0mY7lcyz6yIag+m+BrfHiUmroERW8 u6aROpNSiOiOSt1Qq8UmIVe2kT2lnxA3ICNkgD/sTdWBBe6x03fJmPQLFZN1dRcI dnij9Ee3hQLvApLBiLBfZxbk4KT7Y+AVlenmzgCE/v8VwSrwXom25whab10JYeBh 0I9iAotR+ZLtbUUfKOkEbSOYEGtn/jge4doApqsUov66ycFptbEgZbPCu2UY1L9A == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduuddrudehtddgvddtucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefuvffhfffkgggtgfesthekredttd dtlfenucfhrhhomhepoehgrhgvghhkhheslhhinhhugihfohhunhgurghtihhonhdrohhr gheqnecukfhppeekfedrkeeirdekledruddtjeenucfrrghrrghmpehmrghilhhfrhhomh epghhrvghgsehkrhhorghhrdgtohhmnecuvehluhhsthgvrhfuihiivgeptd X-ME-Proxy: Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) by mail.messagingengine.com (Postfix) with ESMTPA id 0706080060; Sun, 9 Jun 2019 05:44:40 -0400 (EDT) Subject: FAILED: patch "[PATCH] SUNRPC fix regression in umount of a secure mount" failed to apply to 4.19-stable tree To: kolga@netapp.com, Anna.Schumaker@Netapp.com Cc: From: Date: Sun, 09 Jun 2019 11:44:39 +0200 Message-ID: <156007347916760@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The patch below does not apply to the 4.19-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From ec6017d9035986a36de064f48a63245930bfad6f Mon Sep 17 00:00:00 2001 From: Olga Kornievskaia Date: Wed, 29 May 2019 10:46:00 -0400 Subject: [PATCH] SUNRPC fix regression in umount of a secure mount If call_status returns ENOTCONN, we need to re-establish the connection state after. Otherwise the client goes into an infinite loop of call_encode, call_transmit, call_status (ENOTCONN), call_encode. Fixes: c8485e4d63 ("SUNRPC: Handle ECONNREFUSED correctly in xprt_transmit()") Signed-off-by: Olga Kornievskaia Cc: stable@vger.kernel.org # v2.6.29+ Signed-off-by: Anna Schumaker diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c index d6e57da56c94..94a653be8e25 100644 --- a/net/sunrpc/clnt.c +++ b/net/sunrpc/clnt.c @@ -2288,13 +2288,13 @@ call_status(struct rpc_task *task) case -ECONNREFUSED: case -ECONNRESET: case -ECONNABORTED: + case -ENOTCONN: rpc_force_rebind(clnt); /* fall through */ case -EADDRINUSE: rpc_delay(task, 3*HZ); /* fall through */ case -EPIPE: - case -ENOTCONN: case -EAGAIN: break; case -EIO: