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

Commit 64e1ac4d authored Jul 09, 2018 by Al Viro

->atomic_open(): return 0 in all success cases



FMODE_OPENED can be used to distingusish "successful open" from the
"called finish_no_open(), do it yourself" cases.  Since finish_no_open()
has been adjusted, no changes in the instances were actually needed.
The caller has been adjusted.

Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

parent 3ec2eef1

fs/namei.c

+15 −15

Original line number	Diff line number	Diff line
		@@ -3054,6 +3054,7 @@ static int atomic_open(struct nameidata nd, struct dentry dentry,
		open_to_namei_flags(open_flag), mode);
		d_lookup_done(dentry);
		if (!error) {
		if (file->f_mode & FMODE_OPENED) {
		/*
		* We didn't have the inode before the open, so check open
		* permission here.
		@@ -3067,8 +3068,7 @@ static int atomic_open(struct nameidata nd, struct dentry dentry,
		error = may_open(&file->f_path, acc_mode, open_flag);
		if (WARN_ON(error > 0))
		error = -EINVAL;
		} else if (error > 0) {
		if (WARN_ON(file->f_path.dentry == DENTRY_NOT_SET)) {
		} else if (WARN_ON(file->f_path.dentry == DENTRY_NOT_SET)) {
		error = -EIO;
		} else {
		if (file->f_path.dentry) {

fs/open.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -863,13 +863,13 @@ EXPORT_SYMBOL(finish_open);
		* NB: unlike finish_open() this function does consume the dentry reference and
		* the caller need not dput() it.
		*
		* Returns "1" which must be the return value of ->atomic_open() after having
		* Returns "0" which must be the return value of ->atomic_open() after having
		* called this function.
		*/
		int finish_no_open(struct file file, struct dentry dentry)
		{
		file->f_path.dentry = dentry;
		return 1;
		return 0;
		}
		EXPORT_SYMBOL(finish_no_open);