move may_open() from __open_name_create() to do_last() (9b44f1b3) · Commits · e / devices / android_kernel_teracube_emerald

fs/namei.c

+7 −5

Original line number	Diff line number	Diff line
		@@ -2069,11 +2069,7 @@ static int __open_namei_create(struct nameidata nd, struct path path,
		mutex_unlock(&dir->d_inode->i_mutex);
		dput(nd->path.dentry);
		nd->path.dentry = path->dentry;

		if (error)
		return error;
		/* Don't check for write permission, don't truncate */
		return may_open(&nd->path, 0, open_flag & ~O_TRUNC);
		}

		/*
		@@ -2239,6 +2235,12 @@ static struct file do_last(struct nameidata nd, struct path *path,
		mnt_drop_write(nd->path.mnt);
		goto exit;
		}
		/* Don't check for write permission, don't truncate */
		error = may_open(&nd->path, 0, op->open_flag & ~O_TRUNC);
		if (error) {
		mnt_drop_write(nd->path.mnt);
		goto exit;
		}
		filp = nameidata_to_filp(nd);
		mnt_drop_write(nd->path.mnt);
		path_put(&nd->path);