Fix a dumb typo - use of & instead of &&
Al Viro [Sat, 6 Mar 2010 18:41:07 +0000 (18:41 +0000)]
We managed to lose O_DIRECTORY testing due to a stupid typo in commit
1f36f774b2 ("Switch !O_CREAT case to use of do_last()")

Reported-by: Walter Sheets <w41ter@gmail.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

fs/namei.c

index 3d9d2f9..48e60a1 100644 (file)
@@ -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);