diff --git a/[refs] b/[refs] index d232fc8b32a5..b63d024f2d40 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e8a7e48bb248a1196484d3f8afa53bded2b24e71 +refs/heads/master: 37a09f07459753e7c98d4e21f1c61e8756923f81 diff --git a/trunk/fs/nfs/dir.c b/trunk/fs/nfs/dir.c index 8ea4a4180a87..f0a384e2ae63 100644 --- a/trunk/fs/nfs/dir.c +++ b/trunk/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: