Skip to content

Commit

Permalink
Fix a dumb typo - use of & instead of &&
Browse files Browse the repository at this point in the history
We managed to lose O_DIRECTORY testing due to a stupid typo in commit
1f36f77 ("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>
  • Loading branch information
Al Viro authored and Linus Torvalds committed Mar 6, 2010
1 parent 64096c1 commit 781b167
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion fs/namei.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 781b167

Please sign in to comment.