summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-05-12 19:06:53 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-12 19:06:53 +0400
commit6eaed0a438ef554a282210a04da0de27b671d817 (patch)
treed0caf299ebcdac32fad8ab1baa7957e44655d1eb /fs
parent8043f4eb85bf772e3af82678657019937388b6e1 (diff)
parentd24339059d640f108c08ba99ef30e3bafa10f8e4 (diff)
downloadlinux-6eaed0a438ef554a282210a04da0de27b671d817.tar.xz
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse: fuse: fix oops in revalidate when called with NULL nameidata
Diffstat (limited to 'fs')
-rw-r--r--fs/fuse/dir.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
index c6ba49bd95b3..b32eb29a4e6f 100644
--- a/fs/fuse/dir.c
+++ b/fs/fuse/dir.c
@@ -174,7 +174,7 @@ static int fuse_dentry_revalidate(struct dentry *entry, struct nameidata *nd)
if (!inode)
return 0;
- if (nd->flags & LOOKUP_RCU)
+ if (nd && (nd->flags & LOOKUP_RCU))
return -ECHILD;
fc = get_fuse_conn(inode);