From patchwork Thu Apr 11 13:24:13 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: chaoting fan X-Patchwork-Id: 2428371 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 8FB5ADF230 for ; Thu, 11 Apr 2013 13:24:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932200Ab3DKNYc (ORCPT ); Thu, 11 Apr 2013 09:24:32 -0400 Received: from mail-pa0-f41.google.com ([209.85.220.41]:33520 "EHLO mail-pa0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752843Ab3DKNYT (ORCPT ); Thu, 11 Apr 2013 09:24:19 -0400 Received: by mail-pa0-f41.google.com with SMTP id kx1so909984pab.14 for ; Thu, 11 Apr 2013 06:24:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:message-id:date:from:user-agent:mime-version:to:cc :subject:references:in-reply-to:x-forwarded-message-id:content-type :content-transfer-encoding; bh=MsmAkJpqqnMcuC8AOdHFFTEbQEt63hDPPhYjn7Wtrek=; b=kRBMvk77evzkny87glrx7oWhjHSRVMhxHAbS/stNGTM5gR/n+BHjVdh2/BaZcbLmln Sq+IWwle7njgv6Ej+B+8oTp3FEKYsn/9WdPZPGtQrez+5A8VelEgPF5FDsLceUxzTw3y MD2SL47Tp8Wtvtsb5O1uTAjoFaxIVhZogHVA8mud493iUXErtimEHYzsRxmmnDwXAuhF 2aj+3/ekpq5Rfaa1esf4teNBMaPvkqctPeBRLCHbD3tzEEglBYUeJHTjLHTxdd13shtl +vo3uHCvTuvB0Ahf/RoEbUIK5UBf27h97Ebx1yNK458rT17Np0gUycGwZJccOrwrK9g0 BUEA== X-Received: by 10.68.90.36 with SMTP id bt4mr8968873pbb.42.1365686658584; Thu, 11 Apr 2013 06:24:18 -0700 (PDT) Received: from [192.168.1.106] ([223.65.141.50]) by mx.google.com with ESMTPS id cp1sm4198398pbc.42.2013.04.11.06.24.16 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 11 Apr 2013 06:24:17 -0700 (PDT) Message-ID: <5166B97D.60805@gmail.com> Date: Thu, 11 Apr 2013 21:24:13 +0800 From: fanchaoting User-Agent: Mozilla/5.0 (Windows NT 5.1; rv:17.0) Gecko/20130107 Thunderbird/17.0.2 MIME-Version: 1.0 To: "bfields@fieldses.org" CC: "linux-nfs@vger.kernel.org" Subject: [PATCH 2/2] nfsd: remove some useless code References: <5163AFED.5060902@cn.fujitsu.com> In-Reply-To: <5163AFED.5060902@cn.fujitsu.com> X-Forwarded-Message-Id: <5163AFED.5060902@cn.fujitsu.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org the "list_empty(&oo->oo_owner.so_stateids)" is aways true , so we remove it. Signed-off-by: fanchaoting --- fs/nfsd/nfs4state.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 2e27430..e9f1d37 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -3830,8 +3830,7 @@ nfsd4_close(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, * In the 4.0 case we need to keep the owners around a * little while to handle CLOSE replay. */ - if (list_empty(&oo->oo_owner.so_stateids)) - move_to_close_lru(oo, SVC_NET(rqstp)); + move_to_close_lru(oo, SVC_NET(rqstp)); } } out: