Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / fs / hfs / string.c

diff --git a/fs/hfs/string.c b/fs/hfs/string.c
index 927a5af794284b4023b60dc3b27f9216157184b6..495a976a3cc9aa0a0b6e56194ae8f91243129ae5 100644 (file)
--- a/fs/hfs/string.c
+++ b/fs/hfs/string.c
@@ -51,7 +51,8 @@ static unsigned char caseorder[256] = {
 /*
  * Hash a string to an integer in a case-independent way
  */
-int hfs_hash_dentry(struct dentry *dentry, struct qstr *this)
+int hfs_hash_dentry(const struct dentry *dentry, const struct inode *inode,
+               struct qstr *this)
 {
        const unsigned char *name = this->name;
        unsigned int hash, len = this->len;
@@ -92,21 +93,21 @@ int hfs_strcmp(const unsigned char *s1, unsigned int len1,
  * Test for equality of two strings in the HFS filename character ordering.
  * return 1 on failure and 0 on success
  */
-int hfs_compare_dentry(struct dentry *dentry, struct qstr *s1, struct qstr *s2)
+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)
 {
        const unsigned char *n1, *n2;
-       int len;
 
-       len = s1->len;
        if (len >= HFS_NAMELEN) {
-               if (s2->len < HFS_NAMELEN)
+               if (name->len < HFS_NAMELEN)
                        return 1;
                len = HFS_NAMELEN;
-       } else if (len != s2->len)
+       } else if (len != name->len)
                return 1;
 
-       n1 = s1->name;
-       n2 = s2->name;
+       n1 = str;
+       n2 = name->name;
        while (len--) {
                if (caseorder[*n1++] != caseorder[*n2++])
                        return 1;