diff --git a/[refs] b/[refs]
index c7f52eb9bfc5..1f07d97a3e80 100644
--- 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
index 3d9d2f965f84..48e60a187325 100644
--- 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);