diff options
| author | Al Viro <viro@ZenIV.linux.org.uk> | 2010-03-06 18:41:07 +0000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-06 10:54:48 -0800 |
| commit | 781b16775ba0bb55fac0e1757bf0bd87c8879632 (patch) | |
| tree | f081f67fe98a50a217a8c9be8d55e64854e46193 /fs | |
| parent | 64096c17417380d8a472d096645f4cbc9406c987 (diff) | |
| download | linux-3.10-781b16775ba0bb55fac0e1757bf0bd87c8879632.tar.gz linux-3.10-781b16775ba0bb55fac0e1757bf0bd87c8879632.tar.bz2 linux-3.10-781b16775ba0bb55fac0e1757bf0bd87c8879632.zip | |
Fix a dumb typo - use of & instead of &&
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>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/namei.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/namei.c b/fs/namei.c index 3d9d2f965f8..48e60a18732 100644 --- a/fs/namei.c +++ b/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); |