diff --git a/[refs] b/[refs] index 5d9a62730ce6..c4cf0b695157 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 529c5f958f9e60abaa7407986034b17d17536bf2 +refs/heads/master: 53fe924161ff18d24c5c1c256549e9c1b9874827 diff --git a/trunk/fs/gfs2/dentry.c b/trunk/fs/gfs2/dentry.c index 4a456338b873..0da8da2c991d 100644 --- a/trunk/fs/gfs2/dentry.c +++ b/trunk/fs/gfs2/dentry.c @@ -44,7 +44,7 @@ static int gfs2_drevalidate(struct dentry *dentry, struct nameidata *nd) int error; int had_lock = 0; - if (nd->flags & LOOKUP_RCU) + if (nd && nd->flags & LOOKUP_RCU) return -ECHILD; parent = dget_parent(dentry);