diff --git a/[refs] b/[refs] index 6eaccec0ba6b..5bcf11fa8e9e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 340a0a01b9675a16201cc4fc4a210eb5b3bc11ce +refs/heads/master: 3ca30d40a91fb9b9871e61d5dea2c1a895906a15 diff --git a/trunk/fs/cifs/dir.c b/trunk/fs/cifs/dir.c index 14d602f178c2..499f27fc8576 100644 --- a/trunk/fs/cifs/dir.c +++ b/trunk/fs/cifs/dir.c @@ -641,7 +641,7 @@ cifs_lookup(struct inode *parent_dir_inode, struct dentry *direntry, static int cifs_d_revalidate(struct dentry *direntry, struct nameidata *nd) { - if (nd->flags & LOOKUP_RCU) + if (nd && (nd->flags & LOOKUP_RCU)) return -ECHILD; if (direntry->d_inode) {