diff --git a/[refs] b/[refs] index 323fe546a210..c91bc6829113 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4714e63731a8a641b5e0ed5e2e2191c13bf2d71a +refs/heads/master: 8ce84eeb5b40da21f20174dd25891a8409534237 diff --git a/trunk/fs/jfs/namei.c b/trunk/fs/jfs/namei.c index 81ead850ddb6..5a2b269428a6 100644 --- a/trunk/fs/jfs/namei.c +++ b/trunk/fs/jfs/namei.c @@ -1600,7 +1600,7 @@ static int jfs_ci_compare(const struct dentry *parent, static int jfs_ci_revalidate(struct dentry *dentry, struct nameidata *nd) { - if (nd->flags & LOOKUP_RCU) + if (nd && nd->flags & LOOKUP_RCU) return -ECHILD; /* * This is not negative dentry. Always valid.