Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending

[cascardo/linux.git] / fs / hpfs / dentry.c

diff --git a/fs/hpfs/dentry.c b/fs/hpfs/dentry.c
index 60e6d33..bb87d65 100644 (file)
--- a/fs/hpfs/dentry.c
+++ b/fs/hpfs/dentry.c
@@ -34,7 +34,7 @@ static int hpfs_hash_dentry(const struct dentry *dentry, struct qstr *qstr)
        return 0;
 }
 
-static int hpfs_compare_dentry(const struct dentry *parent, const struct dentry *dentry,
+static int hpfs_compare_dentry(const struct dentry *dentry,
                unsigned int len, const char *str, const struct qstr *name)
 {
        unsigned al = len;
@@ -50,7 +50,7 @@ static int hpfs_compare_dentry(const struct dentry *parent, const struct dentry
 
        if (hpfs_chk_name(name->name, &bl))
                return 1;
-       if (hpfs_compare_names(parent->d_sb, str, al, name->name, bl, 0))
+       if (hpfs_compare_names(dentry->d_sb, str, al, name->name, bl, 0))
                return 1;
        return 0;
 }