From patchwork Mon Jun 30 15:54:58 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 4452201 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 5739FBEEAA for ; Mon, 30 Jun 2014 15:55:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5D4D020225 for ; Mon, 30 Jun 2014 15:55:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 915D42021F for ; Mon, 30 Jun 2014 15:55:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755502AbaF3Pz1 (ORCPT ); Mon, 30 Jun 2014 11:55:27 -0400 Received: from mail-qc0-f170.google.com ([209.85.216.170]:47900 "EHLO mail-qc0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755314AbaF3PzY (ORCPT ); Mon, 30 Jun 2014 11:55:24 -0400 Received: by mail-qc0-f170.google.com with SMTP id l6so7367546qcy.29 for ; Mon, 30 Jun 2014 08:55:24 -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=MWq7p+pHzt+7hH9qMD2P9Fluaa2zoXNbgyF4y1gkRM8=; b=fLq/RstTeeSTOi8MDHWzzB0BdHT+4D//VOsq4TLBH3QpkIbtLVzb/5DDP/oWWKfkVf hj1s8vGVcsDixUoFB6WRyt3+FjQ1QdPcZDdbbamu3zKX24Q/5n1pB5c7E7XJZFRob6IW qrps2kVGtGr7gMhl1cDqDsbgSprMKvkZpVJ7JC70Fb19XJey0NINSZYA6cCUj0k6UDzO d5bvscXTjYD8f7kC8wYXygAecUNe8liShrsREAlrdSbevgIDjhxVV91Uhpv8GdYOH8P0 OzYpnAjKzPD/xlCYBb41sW5HJteNPP5eYe8nLW93L+1RZhVbpNVSBCOLH43nak1DoBnD ebUg== X-Gm-Message-State: ALoCoQn04MkLvJbEfrhsCqAJkDi2pg0DcpsNPepXzIGFXgW6kSUWHKLIc88tzqzlMU12M/xr2n9B X-Received: by 10.140.25.120 with SMTP id 111mr52717444qgs.95.1404143724234; Mon, 30 Jun 2014 08:55:24 -0700 (PDT) Received: from tlielax.poochiereds.net ([2001:470:8:d63:3a60:77ff:fe93:a95d]) by mx.google.com with ESMTPSA id b9sm32620754qae.4.2014.06.30.08.55.23 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 30 Jun 2014 08:55:23 -0700 (PDT) From: Jeff Layton To: bfields@fieldses.org Cc: linux-nfs@vger.kernel.org Subject: [PATCH v3 111/114] nfsd: remove nfs4_lock_state: nfs4_laundromat Date: Mon, 30 Jun 2014 11:54:58 -0400 Message-Id: <1404143701-24740-13-git-send-email-jlayton@primarydata.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1404143423-24381-1-git-send-email-jlayton@primarydata.com> References: <1404143423-24381-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=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_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 Signed-off-by: Jeff Layton --- fs/nfsd/nfs4state.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 740f4ea47d48..5d3c4679d48d 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -4115,8 +4115,6 @@ nfs4_laundromat(struct nfsd_net *nn) time_t cutoff = get_seconds() - nn->nfsd4_lease; time_t t, new_timeo = nn->nfsd4_lease; - nfs4_lock_state(); - dprintk("NFSD: laundromat service - starting\n"); nfsd4_end_grace(nn); INIT_LIST_HEAD(&reaplist); @@ -4184,7 +4182,6 @@ nfs4_laundromat(struct nfsd_net *nn) spin_unlock(&nn->client_lock); new_timeo = max_t(time_t, new_timeo, NFSD_LAUNDROMAT_MINTIMEOUT); - nfs4_unlock_state(); return new_timeo; }