| commit | 6eaed0a438ef554a282210a04da0de27b671d817 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu May 12 08:06:53 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu May 12 08:06:53 2011 -0700 |
| tree | d0caf299ebcdac32fad8ab1baa7957e44655d1eb | |
| parent | 8043f4eb85bf772e3af82678657019937388b6e1 [diff] | |
| parent | d24339059d640f108c08ba99ef30e3bafa10f8e4 [diff] |
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
diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c index c6ba49b..b32eb29 100644 --- a/fs/fuse/dir.c +++ b/fs/fuse/dir.c
@@ -174,7 +174,7 @@ if (!inode) return 0; - if (nd->flags & LOOKUP_RCU) + if (nd && (nd->flags & LOOKUP_RCU)) return -ECHILD; fc = get_fuse_conn(inode);