diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2010-11-30 18:42:34 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-30 19:18:49 +0100 |
| commit | 37a09f07459753e7c98d4e21f1c61e8756923f81 (patch) | |
| tree | eecab05dc4b4c2de61f4b31f51d301fdcf210737 /fs/nfs/dir.c | |
| parent | Linux 2.6.37-rc4 (diff) | |
| download | linux-37a09f07459753e7c98d4e21f1c61e8756923f81.tar.xz linux-37a09f07459753e7c98d4e21f1c61e8756923f81.zip | |
NFS: Fix a readdirplus bug
When comparing filehandles in the helper nfs_same_file(), we should not be
using 'strncmp()': filehandles are not null terminated strings.
Instead, we should just use the existing helper nfs_compare_fh().
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to '')
| -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: |