Commit 050ac841 authored by Miklos Szeredi's avatar Miklos Szeredi Committed by Al Viro

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: default avatarMiklos Szeredi <mszeredi@suse.cz>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent af2f5542
...@@ -2384,7 +2384,7 @@ static struct file *do_last(struct nameidata *nd, struct path *path, ...@@ -2384,7 +2384,7 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
if (error) if (error)
return ERR_PTR(error); return ERR_PTR(error);
error = -EISDIR; error = -EISDIR;
if (S_ISDIR(nd->inode->i_mode)) if ((open_flag & O_CREAT) && S_ISDIR(nd->inode->i_mode))
goto exit; goto exit;
error = -ENOTDIR; error = -ENOTDIR;
if ((nd->flags & LOOKUP_DIRECTORY) && !nd->inode->i_op->lookup) if ((nd->flags & LOOKUP_DIRECTORY) && !nd->inode->i_op->lookup)
......
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