From patchwork Wed Jun 28 02:27:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 9813375 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 88914603D7 for ; Wed, 28 Jun 2017 02:27:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6DCCB2582C for ; Wed, 28 Jun 2017 02:27:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 602382623C; Wed, 28 Jun 2017 02:27:31 +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.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, 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 3CD442582C for ; Wed, 28 Jun 2017 02:27:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752905AbdF1C10 (ORCPT ); Tue, 27 Jun 2017 22:27:26 -0400 Received: from mail-it0-f67.google.com ([209.85.214.67]:34491 "EHLO mail-it0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752633AbdF1C10 (ORCPT ); Tue, 27 Jun 2017 22:27:26 -0400 Received: by mail-it0-f67.google.com with SMTP id o202so2072406itc.1 for ; Tue, 27 Jun 2017 19:27:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id; bh=tv+eldGP8ANF0Gx5sAK6bDanArFXOGFOSs0yTCDK1aU=; b=nf9G3Nt1ca8IyA0u4Ub4gRssGz+I5pLU0AZU+R+POjOY8KtTGyV5VGXbVVJB9HOqqo iRQVpkWCcDBQF3C5AH6dV3kHtD1C8UaVhEOwZlxnR6ZuLBmJ4purNPBwPHplSFmxqJzA oJT7S/QKozAvFUTfV6uDGxX/R9v5gVosMP0hXGcXry2fKVmH651jE/fgY7AlZBBvAtwj NOadRZeV5muF9hYgwsvE84F8B7YN47cnWsVgygWPzLgFc1HclAVOF08xniCbKmgwmFBo 7kOD7WVlT8xIYABhcJusd+io1TLXd1/dX7GcXn8RpfjMbqKZ5d3DyDs4JKbg7hUct7KZ bN5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id; bh=tv+eldGP8ANF0Gx5sAK6bDanArFXOGFOSs0yTCDK1aU=; b=PJjMvxr/BqyypYCgMCpamzz0LBCElMumZfxx68GphtGs1bn9A+i8VeoMIsVD6NW3+n Z0MjXWO254YOBOJDNNmpWN91iBmSV4EXuUIcAbyD+O9zpMMqypZlJXVR0xqo1ZPEGsFn C+++UPsrsPY7cmZJleVelwmr5czQVG/JObkRYAKjUjm68apo5tI9JqMyCL5ymVmcE+sO WjlvjGPuS7SuIcJK2jKji+pGZwebUa9yyZ66ghD0A44yl8xih3YjBtNaAKf5P3jIrtO3 GWaqWul86tk4HkFTFvP/iDQtfno5i+PLKs1DB05B+VuIT9WEtqfEfgIdWXFuEY66JvZl x3Lg== X-Gm-Message-State: AKS2vOyoHrnpXbVgwibQGSILGq3dPpQJSkDeyrTxtMuunTVt3Dz/jR1W POj9tgIKvdjr7PJWQ8c= X-Received: by 10.36.3.11 with SMTP id e11mr4747860ite.79.1498616840191; Tue, 27 Jun 2017 19:27:20 -0700 (PDT) Received: from localhost.localdomain (static-50-108-4-17.mskg.mi.frontiernet.net. [50.108.4.17]) by smtp.gmail.com with ESMTPSA id g198sm2288028itb.29.2017.06.27.19.27.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 27 Jun 2017 19:27:19 -0700 (PDT) From: Trond Myklebust To: linux-nfs@vger.kernel.org Subject: [PATCH] NFSv4.1: nfs4_callback_free_slot() cannot call nfs4_slot_tbl_drain_complete() Date: Tue, 27 Jun 2017 22:27:16 -0400 Message-Id: <20170628022716.16785-1-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.9.4 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 The current code works only for the case where we have exactly one slot, which is no longer true. nfs4_free_slot() will automatically declare the callback channel to be drained when all slots have been returned. Signed-off-by: Trond Myklebust --- fs/nfs/callback_xdr.c | 1 - 1 file changed, 1 deletion(-) diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c index c14758e08d73..390ac9c39c59 100644 --- a/fs/nfs/callback_xdr.c +++ b/fs/nfs/callback_xdr.c @@ -753,7 +753,6 @@ static void nfs4_callback_free_slot(struct nfs4_session *session, * A single slot, so highest used slotid is either 0 or -1 */ nfs4_free_slot(tbl, slot); - nfs4_slot_tbl_drain_complete(tbl); spin_unlock(&tbl->slot_tbl_lock); }