diff options
Diffstat (limited to 'fs/hfs/string.c')
-rw-r--r-- | fs/hfs/string.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/fs/hfs/string.c b/fs/hfs/string.c index 927a5af79428..aaf90d0d6940 100644 --- a/fs/hfs/string.c +++ b/fs/hfs/string.c | |||
@@ -92,21 +92,21 @@ int hfs_strcmp(const unsigned char *s1, unsigned int len1, | |||
92 | * Test for equality of two strings in the HFS filename character ordering. | 92 | * Test for equality of two strings in the HFS filename character ordering. |
93 | * return 1 on failure and 0 on success | 93 | * return 1 on failure and 0 on success |
94 | */ | 94 | */ |
95 | int hfs_compare_dentry(struct dentry *dentry, struct qstr *s1, struct qstr *s2) | 95 | int hfs_compare_dentry(const struct dentry *parent, const struct inode *pinode, |
96 | const struct dentry *dentry, const struct inode *inode, | ||
97 | unsigned int len, const char *str, const struct qstr *name) | ||
96 | { | 98 | { |
97 | const unsigned char *n1, *n2; | 99 | const unsigned char *n1, *n2; |
98 | int len; | ||
99 | 100 | ||
100 | len = s1->len; | ||
101 | if (len >= HFS_NAMELEN) { | 101 | if (len >= HFS_NAMELEN) { |
102 | if (s2->len < HFS_NAMELEN) | 102 | if (name->len < HFS_NAMELEN) |
103 | return 1; | 103 | return 1; |
104 | len = HFS_NAMELEN; | 104 | len = HFS_NAMELEN; |
105 | } else if (len != s2->len) | 105 | } else if (len != name->len) |
106 | return 1; | 106 | return 1; |
107 | 107 | ||
108 | n1 = s1->name; | 108 | n1 = str; |
109 | n2 = s2->name; | 109 | n2 = name->name; |
110 | while (len--) { | 110 | while (len--) { |
111 | if (caseorder[*n1++] != caseorder[*n2++]) | 111 | if (caseorder[*n1++] != caseorder[*n2++]) |
112 | return 1; | 112 | return 1; |