From patchwork Wed Dec 15 16:03:01 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fred Isaman X-Patchwork-Id: 413581 X-Patchwork-Delegate: Trond.Myklebust@netapp.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oBFG3OKN011699 for ; Wed, 15 Dec 2010 16:03:25 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753315Ab0LOQDX (ORCPT ); Wed, 15 Dec 2010 11:03:23 -0500 Received: from mx2.netapp.com ([216.240.18.37]:53215 "EHLO mx2.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751819Ab0LOQDW (ORCPT ); Wed, 15 Dec 2010 11:03:22 -0500 X-IronPort-AV: E=Sophos;i="4.59,349,1288594800"; d="scan'208";a="495186956" Received: from smtp1.corp.netapp.com ([10.57.156.124]) by mx2-out.netapp.com with ESMTP; 15 Dec 2010 08:03:22 -0800 Received: from localhost.localdomain (vpn2ntap-71744.hq.netapp.com [10.58.57.236]) by smtp1.corp.netapp.com (8.13.1/8.13.1/NTAP-1.6) with ESMTP id oBFG3Loq001580 for ; Wed, 15 Dec 2010 08:03:22 -0800 (PST) From: Fred Isaman To: linux-nfs@vger.kernel.org Subject: [PATCH 01/11] wave 2: restore removed comment in nfs4_evict_inode Date: Wed, 15 Dec 2010 11:03:01 -0500 Message-Id: <1292428991-30788-1-git-send-email-iisaman@netapp.com> X-Mailer: git-send-email 1.7.2.1 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Wed, 15 Dec 2010 16:03:25 +0000 (UTC) diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c index 54a2fc7..e557d96 100644 --- a/fs/nfs/inode.c +++ b/fs/nfs/inode.c @@ -1425,6 +1425,7 @@ void nfs4_evict_inode(struct inode *inode) pnfs_destroy_layout(NFS_I(inode)); /* If we are holding a delegation, return it! */ nfs_inode_return_delegation_noreclaim(inode); + /* First call standard NFS clear_inode() code */ nfs_clear_inode(inode); } #endif