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=-6.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 F2FEDC4360F for ; Mon, 1 Apr 2019 17:52:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C5BA02146E for ; Mon, 1 Apr 2019 17:52:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1554141120; bh=LgxbULNNqkA797Cw9+3tRfhXSmGnCmjDLGN64ahgpYc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ocS1g3iAaEdmTOqiSA8Yfvcx8KbY06zrE2J1scYjilr2aP0JRqSJ7QB1bOmmopN74 VtlHk9rKP1mUksIgOEM41v7gLGfUX+jK4llclhV//iNAnfa7HDuGpuiAj0DzjQfVw4 0u5MIBRBOJ/k0a2ta/Gopoky25aVr5mx9bBeMNSk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732622AbfDAR1B (ORCPT ); Mon, 1 Apr 2019 13:27:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:59552 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732619AbfDAR1B (ORCPT ); Mon, 1 Apr 2019 13:27:01 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 48A9320883; Mon, 1 Apr 2019 17:27:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1554139620; bh=LgxbULNNqkA797Cw9+3tRfhXSmGnCmjDLGN64ahgpYc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0dwt/mJmTXcC8rMQitz/GkBs2HMUqYkglUtzcIjLA80ceNVbknhzuaJg8xbdxYTR3 h8ZY80H2SCGl4JHUUlYYSUP+F13du8DzVNEvWHzhef8ePwCtzd50yE7/UqnRCSaihD yQqilrevvucYAsTZG/fkBHjCDReu7CiylDZufhLI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Olga Kornievskaia , Trond Myklebust Subject: [PATCH 4.9 21/56] NFSv4.1 dont free interrupted slot on open Date: Mon, 1 Apr 2019 19:02:37 +0200 Message-Id: <20190401170105.133091652@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190401170103.398401360@linuxfoundation.org> References: <20190401170103.398401360@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Olga Kornievskaia commit 0cb98abb5bd13b9a636bde603d952d722688b428 upstream. Allow the async rpc task for finish and update the open state if needed, then free the slot. Otherwise, the async rpc unable to decode the reply. Signed-off-by: Olga Kornievskaia Fixes: ae55e59da0e4 ("pnfs: Don't release the sequence slot...") Cc: stable@vger.kernel.org # v4.18+ Signed-off-by: Trond Myklebust Signed-off-by: Greg Kroah-Hartman --- fs/nfs/nfs4proc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -2748,7 +2748,8 @@ static int _nfs4_open_and_get_state(stru nfs4_schedule_stateid_recovery(server, state); } out: - nfs4_sequence_free_slot(&opendata->o_res.seq_res); + if (!opendata->cancelled) + nfs4_sequence_free_slot(&opendata->o_res.seq_res); return ret; }