Commit 781b1677 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds

Fix a dumb typo - use of & instead of &&

We managed to lose O_DIRECTORY testing due to a stupid typo in commit
1f36f774 ("Switch !O_CREAT case to use of do_last()")
Reported-by: default avatarWalter Sheets <w41ter@gmail.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 64096c17
...@@ -1656,7 +1656,7 @@ static struct file *do_last(struct nameidata *nd, struct path *path, ...@@ -1656,7 +1656,7 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
if (path->dentry->d_inode->i_op->follow_link) if (path->dentry->d_inode->i_op->follow_link)
return NULL; return NULL;
error = -ENOTDIR; 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; goto exit_dput;
path_to_nameidata(path, nd); path_to_nameidata(path, nd);
audit_inode(pathname, nd->path.dentry); audit_inode(pathname, nd->path.dentry);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment