From patchwork Tue Apr 9 06:06:37 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: fanchaoting X-Patchwork-Id: 2419371 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 4F6E540060 for ; Wed, 10 Apr 2013 06:05:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751866Ab3DJGFf (ORCPT ); Wed, 10 Apr 2013 02:05:35 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:49824 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1752220Ab3DJGFe (ORCPT ); Wed, 10 Apr 2013 02:05:34 -0400 X-IronPort-AV: E=Sophos;i="4.87,445,1363104000"; d="scan'208";a="7026417" Received: from unknown (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 10 Apr 2013 14:02:41 +0800 Received: from fnstmail02.fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id r3A65GMM025059; Wed, 10 Apr 2013 14:05:17 +0800 Received: from localhost.localdomain ([10.167.233.70]) by fnstmail02.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.3) with ESMTP id 2013041014040623-430850 ; Wed, 10 Apr 2013 14:04:06 +0800 Message-ID: <5163AFED.5060902@cn.fujitsu.com> Date: Tue, 09 Apr 2013 14:06:37 +0800 From: fanchaoting User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:12.0) Gecko/20120430 Thunderbird/12.0.1 MIME-Version: 1.0 To: "bfields@fieldses.org" CC: "linux-nfs@vger.kernel.org" Subject: [PATCH] nfsd: remove some useless code X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/04/10 14:04:06, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/04/10 14:04:06, Serialize complete at 2013/04/10 14:04:06 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: