---

yaml --- r: 186184 b: refs/heads/master c: 781b167 h: refs/heads/master v: v3
git-mirror · Mar 6, 2010 · fa2cf92 · fa2cf92
1 parent 26f6afb
commit fa2cf92
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 64096c17417380d8a472d096645f4cbc9406c987
+refs/heads/master: 781b16775ba0bb55fac0e1757bf0bd87c8879632
diff --git a/trunk/fs/namei.c b/trunk/fs/namei.c
@@ -1656,7 +1656,7 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
 		if (path->dentry->d_inode->i_op->follow_link)
 			return NULL;
 		error = -ENOTDIR;
-		if (*want_dir & !path->dentry->d_inode->i_op->lookup)
+		if (*want_dir && !path->dentry->d_inode->i_op->lookup)
 			goto exit_dput;
 		path_to_nameidata(path, nd);
 		audit_inode(pathname, nd->path.dentry);