diff options
| author | Miklos Szeredi <mszeredi@suse.cz> | 2012-05-21 11:30:12 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-06-01 12:11:59 -0400 |
| commit | 050ac841ea90610067fec26150574be8c6077738 (patch) | |
| tree | 9cad4c8ddc28fc4d22715c6a72ade663a5063815 /fs | |
| parent | af2f55426d1d888dcc0ba8dc9e9deb49fae38e38 (diff) | |
vfs: do_last(): only return EISDIR for O_CREAT
This allows this code to be shared between O_CREAT and plain opens.
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
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 4767c0588b6e..90210b46b461 100644 --- a/fs/namei.c +++ b/fs/namei.c | |||
| @@ -2384,7 +2384,7 @@ static struct file *do_last(struct nameidata *nd, struct path *path, | |||
| 2384 | if (error) | 2384 | if (error) |
| 2385 | return ERR_PTR(error); | 2385 | return ERR_PTR(error); |
| 2386 | error = -EISDIR; | 2386 | error = -EISDIR; |
| 2387 | if (S_ISDIR(nd->inode->i_mode)) | 2387 | if ((open_flag & O_CREAT) && S_ISDIR(nd->inode->i_mode)) |
| 2388 | goto exit; | 2388 | goto exit; |
| 2389 | error = -ENOTDIR; | 2389 | error = -ENOTDIR; |
| 2390 | if ((nd->flags & LOOKUP_DIRECTORY) && !nd->inode->i_op->lookup) | 2390 | if ((nd->flags & LOOKUP_DIRECTORY) && !nd->inode->i_op->lookup) |