summaryrefslogtreecommitdiffstats
path: root/fs/jfs/namei.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-03-10 23:00:44 +0100
committerDavid S. Miller <davem@davemloft.net>2011-03-10 23:00:44 +0100
commitbef6e7e76868ab454d5e83635a4a7a1961c74fb5 (patch)
tree1a7417b9dde942cc71f87c02688c6ac6b0e57a72 /fs/jfs/namei.c
parentnet: bridge builtin vs. ipv6 modular (diff)
parentMerge branch 'media_fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/m... (diff)
downloadlinux-bef6e7e76868ab454d5e83635a4a7a1961c74fb5.tar.xz
linux-bef6e7e76868ab454d5e83635a4a7a1961c74fb5.zip
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'fs/jfs/namei.c')
-rw-r--r--fs/jfs/namei.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/jfs/namei.c b/fs/jfs/namei.c
index 81ead850ddb6..5a2b269428a6 100644
--- a/fs/jfs/namei.c
+++ b/fs/jfs/namei.c
@@ -1600,7 +1600,7 @@ out:
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.