From patchwork Wed Jan 5 15:38:29 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Rees X-Patchwork-Id: 453701 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 p05FbOM0011997 for ; Wed, 5 Jan 2011 15:38:33 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751340Ab1AEPic (ORCPT ); Wed, 5 Jan 2011 10:38:32 -0500 Received: from magus.merit.edu ([198.108.1.13]:38481 "EHLO magus.merit.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751257Ab1AEPib (ORCPT ); Wed, 5 Jan 2011 10:38:31 -0500 Received: from localhost (localhost [127.0.0.1]) by magus.merit.edu (Postfix) with ESMTP id CA09B22522F; Wed, 5 Jan 2011 10:38:30 -0500 (EST) X-Virus-Scanned: amavisd-new at magus.merit.edu Received: from magus.merit.edu ([127.0.0.1]) by localhost (magus.merit.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id OwWJ-rArMJDl; Wed, 5 Jan 2011 10:38:30 -0500 (EST) Received: from merit.edu (manihiki.merit.edu [198.108.60.79]) by magus.merit.edu (Postfix) with ESMTPSA id 22BCE22519C; Wed, 5 Jan 2011 10:38:30 -0500 (EST) Date: Wed, 5 Jan 2011 10:38:29 -0500 From: Jim Rees To: Marc Kleine-Budde Cc: Uwe =?iso-8859-1?Q?Kleine-K=F6nig?= , Russell King - ARM Linux , Trond Myklebust , linux-nfs@vger.kernel.org, Linus Torvalds , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Marc Kleine-Budde Subject: Re: still nfs problems [Was: Linux 2.6.37-rc8] Message-ID: <20110105153829.GB11608@merit.edu> References: <1293731992.4919.5.camel@heimdal.trondhjem.org> <20101230191846.GB14221@pengutronix.de> <20110103213850.GC25121@pengutronix.de> <1294100558.25100.8.camel@heimdal.trondhjem.org> <20110105084014.GN25121@pengutronix.de> <20110105110517.GQ25121@pengutronix.de> <20110105112701.GA8638@n2100.arm.linux.org.uk> <20110105134045.GS25121@pengutronix.de> <20110105142902.GA9278@merit.edu> <4D248343.2000407@pengutronix.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <4D248343.2000407@pengutronix.de> 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, 05 Jan 2011 15:38:34 +0000 (UTC) diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c index 8ea4a41..f0a384e 100644 --- a/fs/nfs/dir.c +++ b/fs/nfs/dir.c @@ -395,13 +395,9 @@ int xdr_decode(nfs_readdir_descriptor_t *desc, struct nfs_entry *entry, struct x static int nfs_same_file(struct dentry *dentry, struct nfs_entry *entry) { - struct nfs_inode *node; if (dentry->d_inode == NULL) goto different; - node = NFS_I(dentry->d_inode); - if (node->fh.size != entry->fh->size) - goto different; - if (strncmp(node->fh.data, entry->fh->data, node->fh.size) != 0) + if (nfs_compare_fh(entry->fh, NFS_FH(dentry->d_inode)) != 0) goto different; return 1; different: