diff options
Diffstat (limited to 'fs/hfsplus/hfsplus_fs.h')
-rw-r--r-- | fs/hfsplus/hfsplus_fs.h | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/fs/hfsplus/hfsplus_fs.h b/fs/hfsplus/hfsplus_fs.h index 17ac254e72cb..c4abec167826 100644 --- a/fs/hfsplus/hfsplus_fs.h +++ b/fs/hfsplus/hfsplus_fs.h | |||
@@ -37,7 +37,8 @@ | |||
37 | #define HFSPLUS_TYPE_DATA 0x00 | 37 | #define HFSPLUS_TYPE_DATA 0x00 |
38 | #define HFSPLUS_TYPE_RSRC 0xFF | 38 | #define HFSPLUS_TYPE_RSRC 0xFF |
39 | 39 | ||
40 | typedef int (*btree_keycmp)(const hfsplus_btree_key *, const hfsplus_btree_key *); | 40 | typedef int (*btree_keycmp)(const hfsplus_btree_key *, |
41 | const hfsplus_btree_key *); | ||
41 | 42 | ||
42 | #define NODE_HASH_SIZE 256 | 43 | #define NODE_HASH_SIZE 256 |
43 | 44 | ||
@@ -352,9 +353,12 @@ int hfs_brec_read(struct hfs_find_data *, void *, int); | |||
352 | int hfs_brec_goto(struct hfs_find_data *, int); | 353 | int hfs_brec_goto(struct hfs_find_data *, int); |
353 | 354 | ||
354 | /* catalog.c */ | 355 | /* catalog.c */ |
355 | int hfsplus_cat_case_cmp_key(const hfsplus_btree_key *, const hfsplus_btree_key *); | 356 | int hfsplus_cat_case_cmp_key(const hfsplus_btree_key *, |
356 | int hfsplus_cat_bin_cmp_key(const hfsplus_btree_key *, const hfsplus_btree_key *); | 357 | const hfsplus_btree_key *); |
357 | void hfsplus_cat_build_key(struct super_block *sb, hfsplus_btree_key *, u32, struct qstr *); | 358 | int hfsplus_cat_bin_cmp_key(const hfsplus_btree_key *, |
359 | const hfsplus_btree_key *); | ||
360 | void hfsplus_cat_build_key(struct super_block *sb, | ||
361 | hfsplus_btree_key *, u32, struct qstr *); | ||
358 | int hfsplus_find_cat(struct super_block *, u32, struct hfs_find_data *); | 362 | int hfsplus_find_cat(struct super_block *, u32, struct hfs_find_data *); |
359 | int hfsplus_create_cat(u32, struct inode *, struct qstr *, struct inode *); | 363 | int hfsplus_create_cat(u32, struct inode *, struct qstr *, struct inode *); |
360 | int hfsplus_delete_cat(u32, struct inode *, struct qstr *); | 364 | int hfsplus_delete_cat(u32, struct inode *, struct qstr *); |
@@ -370,7 +374,8 @@ extern const struct file_operations hfsplus_dir_operations; | |||
370 | int hfsplus_ext_cmp_key(const hfsplus_btree_key *, const hfsplus_btree_key *); | 374 | int hfsplus_ext_cmp_key(const hfsplus_btree_key *, const hfsplus_btree_key *); |
371 | void hfsplus_ext_write_extent(struct inode *); | 375 | void hfsplus_ext_write_extent(struct inode *); |
372 | int hfsplus_get_block(struct inode *, sector_t, struct buffer_head *, int); | 376 | int hfsplus_get_block(struct inode *, sector_t, struct buffer_head *, int); |
373 | int hfsplus_free_fork(struct super_block *, u32, struct hfsplus_fork_raw *, int); | 377 | int hfsplus_free_fork(struct super_block *, u32, |
378 | struct hfsplus_fork_raw *, int); | ||
374 | int hfsplus_file_extend(struct inode *); | 379 | int hfsplus_file_extend(struct inode *); |
375 | void hfsplus_file_truncate(struct inode *); | 380 | void hfsplus_file_truncate(struct inode *); |
376 | 381 | ||
@@ -411,12 +416,17 @@ extern u16 hfsplus_decompose_table[]; | |||
411 | extern u16 hfsplus_compose_table[]; | 416 | extern u16 hfsplus_compose_table[]; |
412 | 417 | ||
413 | /* unicode.c */ | 418 | /* unicode.c */ |
414 | int hfsplus_strcasecmp(const struct hfsplus_unistr *, const struct hfsplus_unistr *); | 419 | int hfsplus_strcasecmp(const struct hfsplus_unistr *, |
415 | int hfsplus_strcmp(const struct hfsplus_unistr *, const struct hfsplus_unistr *); | 420 | const struct hfsplus_unistr *); |
416 | int hfsplus_uni2asc(struct super_block *, const struct hfsplus_unistr *, char *, int *); | 421 | int hfsplus_strcmp(const struct hfsplus_unistr *, |
417 | int hfsplus_asc2uni(struct super_block *, struct hfsplus_unistr *, const char *, int); | 422 | const struct hfsplus_unistr *); |
423 | int hfsplus_uni2asc(struct super_block *, | ||
424 | const struct hfsplus_unistr *, char *, int *); | ||
425 | int hfsplus_asc2uni(struct super_block *, | ||
426 | struct hfsplus_unistr *, const char *, int); | ||
418 | int hfsplus_hash_dentry(struct dentry *dentry, struct qstr *str); | 427 | int hfsplus_hash_dentry(struct dentry *dentry, struct qstr *str); |
419 | int hfsplus_compare_dentry(struct dentry *dentry, struct qstr *s1, struct qstr *s2); | 428 | int hfsplus_compare_dentry(struct dentry *dentry, |
429 | struct qstr *s1, struct qstr *s2); | ||
420 | 430 | ||
421 | /* wrapper.c */ | 431 | /* wrapper.c */ |
422 | int hfsplus_read_wrapper(struct super_block *); | 432 | int hfsplus_read_wrapper(struct super_block *); |