diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-11-30 10:29:46 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-11-30 10:29:46 +1100 |
| commit | 2f413f2bbe3dc0cc739e31e31faace0cdbf220aa (patch) | |
| tree | f2d75fca225fd839eaef5424ec92dd89c25ed830 /fs | |
| parent | f82fa2a3ad420699b0780535d39971864d0d952e (diff) | |
| parent | 2756441f0ecd01b3cd43d83bd3a784d759cfcc7a (diff) | |
Merge remote branch 'nfs/linux-next'
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nfs/dir.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c index 8ea4a4180a87..f0a384e2ae63 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: |