diff options
| author | Jeff Layton <jlayton@redhat.com> | 2010-02-05 13:30:36 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2010-02-08 12:52:34 -0500 |
| commit | 05507fa2ac8d5e503bcf33ee43329449027d9060 (patch) | |
| tree | 67c0ca8e766d07c5ef4d7a40515d4bf494560b25 | |
| parent | ccd4bb1beb3316de4611de24d223ad761b5a7e95 (diff) | |
cifs: fix dentry hash calculation for case-insensitive mounts
case-insensitive mounts shouldn't use full_name_hash(). Make sure we
use the parent dentry's d_hash routine when one is set.
Reported-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
| -rw-r--r-- | fs/cifs/readdir.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/fs/cifs/readdir.c b/fs/cifs/readdir.c index f5618f8cc462..c343b14ba2d3 100644 --- a/fs/cifs/readdir.c +++ b/fs/cifs/readdir.c | |||
| @@ -77,6 +77,11 @@ cifs_readdir_lookup(struct dentry *parent, struct qstr *name, | |||
| 77 | 77 | ||
| 78 | cFYI(1, ("For %s", name->name)); | 78 | cFYI(1, ("For %s", name->name)); |
| 79 | 79 | ||
| 80 | if (parent->d_op && parent->d_op->d_hash) | ||
| 81 | parent->d_op->d_hash(parent, name); | ||
| 82 | else | ||
| 83 | name->hash = full_name_hash(name->name, name->len); | ||
| 84 | |||
| 80 | dentry = d_lookup(parent, name); | 85 | dentry = d_lookup(parent, name); |
| 81 | if (dentry) { | 86 | if (dentry) { |
| 82 | /* FIXME: check for inode number changes? */ | 87 | /* FIXME: check for inode number changes? */ |
| @@ -671,8 +676,6 @@ static int cifs_get_name_from_search_buf(struct qstr *pqst, | |||
| 671 | pqst->name = filename; | 676 | pqst->name = filename; |
| 672 | pqst->len = len; | 677 | pqst->len = len; |
| 673 | } | 678 | } |
| 674 | pqst->hash = full_name_hash(pqst->name, pqst->len); | ||
| 675 | /* cFYI(1, ("filldir on %s",pqst->name)); */ | ||
| 676 | return rc; | 679 | return rc; |
| 677 | } | 680 | } |
| 678 | 681 | ||
