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

[karo-tx-linux.git] / fs / isofs / namei.c

diff --git a/fs/isofs/namei.c b/fs/isofs/namei.c
index 6f6dd0c6429f206374fcb6230a4f2f52de56da6a..7b543e6b6526dc8ceebe9bd09aaa07e2d7045236 100644 (file)
--- a/fs/isofs/namei.c
+++ b/fs/isofs/namei.c
@@ -20,6 +20,8 @@ isofs_cmp(struct dentry *dentry, const char *compare, int dlen)
        struct qstr qstr;
        qstr.name = compare;
        qstr.len = dlen;
+       if (likely(!dentry->d_op))
+               return dentry->d_name.len != dlen || memcmp(dentry->d_name.name, compare, dlen);
        return dentry->d_op->d_compare(NULL, NULL, dentry->d_name.len, dentry->d_name.name, &qstr);
 }