diff options
Diffstat (limited to 'fs/adfs/dir.c')
-rw-r--r-- | fs/adfs/dir.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/fs/adfs/dir.c b/fs/adfs/dir.c index f4287e4de744..3b4a764ed780 100644 --- a/fs/adfs/dir.c +++ b/fs/adfs/dir.c | |||
@@ -201,7 +201,8 @@ const struct file_operations adfs_dir_operations = { | |||
201 | }; | 201 | }; |
202 | 202 | ||
203 | static int | 203 | static int |
204 | adfs_hash(struct dentry *parent, struct qstr *qstr) | 204 | adfs_hash(const struct dentry *parent, const struct inode *inode, |
205 | struct qstr *qstr) | ||
205 | { | 206 | { |
206 | const unsigned int name_len = ADFS_SB(parent->d_sb)->s_namelen; | 207 | const unsigned int name_len = ADFS_SB(parent->d_sb)->s_namelen; |
207 | const unsigned char *name; | 208 | const unsigned char *name; |
@@ -237,17 +238,19 @@ adfs_hash(struct dentry *parent, struct qstr *qstr) | |||
237 | * requirements of the underlying filesystem. | 238 | * requirements of the underlying filesystem. |
238 | */ | 239 | */ |
239 | static int | 240 | static int |
240 | adfs_compare(struct dentry *parent, struct qstr *entry, struct qstr *name) | 241 | adfs_compare(const struct dentry *parent, const struct inode *pinode, |
242 | const struct dentry *dentry, const struct inode *inode, | ||
243 | unsigned int len, const char *str, const struct qstr *name) | ||
241 | { | 244 | { |
242 | int i; | 245 | int i; |
243 | 246 | ||
244 | if (entry->len != name->len) | 247 | if (len != name->len) |
245 | return 1; | 248 | return 1; |
246 | 249 | ||
247 | for (i = 0; i < name->len; i++) { | 250 | for (i = 0; i < name->len; i++) { |
248 | char a, b; | 251 | char a, b; |
249 | 252 | ||
250 | a = entry->name[i]; | 253 | a = str[i]; |
251 | b = name->name[i]; | 254 | b = name->name[i]; |
252 | 255 | ||
253 | if (a >= 'A' && a <= 'Z') | 256 | if (a >= 'A' && a <= 'Z') |
@@ -273,7 +276,6 @@ adfs_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd) | |||
273 | struct object_info obj; | 276 | struct object_info obj; |
274 | int error; | 277 | int error; |
275 | 278 | ||
276 | dentry->d_op = &adfs_dentry_operations; | ||
277 | lock_kernel(); | 279 | lock_kernel(); |
278 | error = adfs_dir_lookup_byname(dir, &dentry->d_name, &obj); | 280 | error = adfs_dir_lookup_byname(dir, &dentry->d_name, &obj); |
279 | if (error == 0) { | 281 | if (error == 0) { |