Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 050ac841 authored May 21, 2012 by Miklos Szeredi Committed by Al Viro Jun 01, 2012

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>

parent af2f5542

fs/namei.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2384,7 +2384,7 @@ static struct file do_last(struct nameidata nd, struct path *path,
		if (error)
		return ERR_PTR(error);
		error = -EISDIR;
		if (S_ISDIR(nd->inode->i_mode))
		if ((open_flag & O_CREAT) && S_ISDIR(nd->inode->i_mode))
		goto exit;
		error = -ENOTDIR;
		if ((nd->flags & LOOKUP_DIRECTORY) && !nd->inode->i_op->lookup)