From patchwork Wed Jul 30 12:27:03 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 4647911 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id C5D12C0338 for ; Wed, 30 Jul 2014 12:27:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 07D9020138 for ; Wed, 30 Jul 2014 12:27:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 37A56200E9 for ; Wed, 30 Jul 2014 12:27:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754662AbaG3M1t (ORCPT ); Wed, 30 Jul 2014 08:27:49 -0400 Received: from mail-qa0-f46.google.com ([209.85.216.46]:54137 "EHLO mail-qa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753556AbaG3M1s (ORCPT ); Wed, 30 Jul 2014 08:27:48 -0400 Received: by mail-qa0-f46.google.com with SMTP id v10so1189011qac.5 for ; Wed, 30 Jul 2014 05:27:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=8diMdnzK05qDO+oJVmcCgZMujkgBUlIt7c22Pjp6C4k=; b=AQMtPeAbzrxDgNZbAYKBJdBFs3gU99hl+/Z8QtCrZeHMzojfOj2HDDM7iKd0epX40h X6FfSualS1AFtdnGUyrU6CsC29Sy6Cu4q1pe1dpe20jOy31I8b2dYNBUtXbLcHDN8yaO 6k8nU8TymnwvkVbdAQ2kmtD8pn7eKI5zTfLjw32VBs4eQJzvSXpeBsvvIe5sroCaDMxU L8eBjJH/upXfDDhRH2xOl3wEnja+VBNWeX4vujkys1Y8YDWTJUlpqGdBV9G1jF5kaGgV SC+1/XHhBwfUNID2ECiR7G70Lh2RYkuGe6HNPJkqkCPZC/N4bSZxp4P8Bf1FcdIwLfSl nSRA== X-Gm-Message-State: ALoCoQn8VB69Fr5AFfzKLXt1dZ7a6MblCWayvwTrq1PYmhKn17TKNPy9XN1P9oz67QTAjhWlC69x X-Received: by 10.140.86.147 with SMTP id p19mr6080907qgd.66.1406723267229; Wed, 30 Jul 2014 05:27:47 -0700 (PDT) Received: from tlielax.poochiereds.net ([2001:470:8:d63:3a60:77ff:fe93:a95d]) by mx.google.com with ESMTPSA id t23sm2384767qge.13.2014.07.30.05.27.45 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Jul 2014 05:27:46 -0700 (PDT) From: Jeff Layton To: bfields@fieldses.org Cc: linux-nfs@vger.kernel.org, hch@infradead.org, Trond Myklebust Subject: [PATCH 02/37] nfsd: Ensure that the laundromat unhashes the client before releasing locks Date: Wed, 30 Jul 2014 08:27:03 -0400 Message-Id: <1406723258-8512-3-git-send-email-jlayton@primarydata.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1406723258-8512-1-git-send-email-jlayton@primarydata.com> References: <1406723258-8512-1-git-send-email-jlayton@primarydata.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Trond Myklebust If we leave the client on the confirmed/unconfirmed tables, and leave the sessions visible on the sessionid_hashtbl, then someone might find them before we've had a chance to destroy them. Signed-off-by: Trond Myklebust --- fs/nfsd/nfs4state.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index cb630db015b0..a374592e7dcf 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -4125,13 +4125,15 @@ nfs4_laundromat(struct nfsd_net *nn) clp->cl_clientid.cl_id); continue; } - list_move(&clp->cl_lru, &reaplist); + unhash_client_locked(clp); + list_add(&clp->cl_lru, &reaplist); } spin_unlock(&nn->client_lock); list_for_each_safe(pos, next, &reaplist) { clp = list_entry(pos, struct nfs4_client, cl_lru); dprintk("NFSD: purging unused client (clientid %08x)\n", clp->cl_clientid.cl_id); + list_del_init(&clp->cl_lru); expire_client(clp); } spin_lock(&state_lock);