diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-01-10 14:23:41 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-01-10 14:23:41 -0800 |
| commit | 274353674dd0337bdeeaee08a9f2047777b07ab0 (patch) | |
| tree | b788d77dd7c0e8f27bbcc89fc742c212c28872c0 /fs/hfs/hfs_fs.h | |
| parent | 1740d483ba4d79f9fa6984dccd7152b6b208f1bf (diff) | |
| parent | d7cd5c73cec2dfa9f259a2adcf802c9f8fcc125f (diff) | |
| download | blackbird-op-linux-274353674dd0337bdeeaee08a9f2047777b07ab0.tar.gz blackbird-op-linux-274353674dd0337bdeeaee08a9f2047777b07ab0.zip | |
Merge branch 'ehci-omap-clock' into omap-fixes
Diffstat (limited to 'fs/hfs/hfs_fs.h')
| -rw-r--r-- | fs/hfs/hfs_fs.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/fs/hfs/hfs_fs.h b/fs/hfs/hfs_fs.h index c8cffb81e849..ad97c2d58287 100644 --- a/fs/hfs/hfs_fs.h +++ b/fs/hfs/hfs_fs.h @@ -213,10 +213,14 @@ extern int hfs_part_find(struct super_block *, sector_t *, sector_t *); /* string.c */ extern const struct dentry_operations hfs_dentry_operations; -extern int hfs_hash_dentry(struct dentry *, struct qstr *); +extern int hfs_hash_dentry(const struct dentry *, const struct inode *, + struct qstr *); extern int hfs_strcmp(const unsigned char *, unsigned int, const unsigned char *, unsigned int); -extern int hfs_compare_dentry(struct dentry *, struct qstr *, struct qstr *); +extern int hfs_compare_dentry(const struct dentry *parent, + const struct inode *pinode, + const struct dentry *dentry, const struct inode *inode, + unsigned int len, const char *str, const struct qstr *name); /* trans.c */ extern void hfs_asc2mac(struct super_block *, struct hfs_name *, struct qstr *); |
