diff options
Diffstat (limited to 'fs/hpfs/dentry.c')
| -rw-r--r-- | fs/hpfs/dentry.c | 14 | 
1 files changed, 8 insertions, 6 deletions
| diff --git a/fs/hpfs/dentry.c b/fs/hpfs/dentry.c index 940d6d150bee..67d9d36b3d5f 100644 --- a/fs/hpfs/dentry.c +++ b/fs/hpfs/dentry.c | |||
| @@ -20,8 +20,8 @@ static int hpfs_hash_dentry(struct dentry *dentry, struct qstr *qstr) | |||
| 20 | 20 | ||
| 21 | if (l == 1) if (qstr->name[0]=='.') goto x; | 21 | if (l == 1) if (qstr->name[0]=='.') goto x; | 
| 22 | if (l == 2) if (qstr->name[0]=='.' || qstr->name[1]=='.') goto x; | 22 | if (l == 2) if (qstr->name[0]=='.' || qstr->name[1]=='.') goto x; | 
| 23 | hpfs_adjust_length((char *)qstr->name, &l); | 23 | hpfs_adjust_length(qstr->name, &l); | 
| 24 | /*if (hpfs_chk_name((char *)qstr->name,&l))*/ | 24 | /*if (hpfs_chk_name(qstr->name,&l))*/ | 
| 25 | /*return -ENAMETOOLONG;*/ | 25 | /*return -ENAMETOOLONG;*/ | 
| 26 | /*return -ENOENT;*/ | 26 | /*return -ENOENT;*/ | 
| 27 | x: | 27 | x: | 
| @@ -38,14 +38,16 @@ static int hpfs_compare_dentry(struct dentry *dentry, struct qstr *a, struct qst | |||
| 38 | { | 38 | { | 
| 39 | unsigned al=a->len; | 39 | unsigned al=a->len; | 
| 40 | unsigned bl=b->len; | 40 | unsigned bl=b->len; | 
| 41 | hpfs_adjust_length((char *)a->name, &al); | 41 | hpfs_adjust_length(a->name, &al); | 
| 42 | /*hpfs_adjust_length((char *)b->name, &bl);*/ | 42 | /*hpfs_adjust_length(b->name, &bl);*/ | 
| 43 | /* 'a' is the qstr of an already existing dentry, so the name | 43 | /* 'a' is the qstr of an already existing dentry, so the name | 
| 44 | * must be valid. 'b' must be validated first. | 44 | * must be valid. 'b' must be validated first. | 
| 45 | */ | 45 | */ | 
| 46 | 46 | ||
| 47 | if (hpfs_chk_name((char *)b->name, &bl)) return 1; | 47 | if (hpfs_chk_name(b->name, &bl)) | 
| 48 | if (hpfs_compare_names(dentry->d_sb, (char *)a->name, al, (char *)b->name, bl, 0)) return 1; | 48 | return 1; | 
| 49 | if (hpfs_compare_names(dentry->d_sb, a->name, al, b->name, bl, 0)) | ||
| 50 | return 1; | ||
| 49 | return 0; | 51 | return 0; | 
| 50 | } | 52 | } | 
| 51 | 53 | ||
