Commit 239eb983 authored by Al Viro's avatar Al Viro
Browse files

atomic_open(): saner calling conventions (return dentry on success) 



Currently it either returns -E... or puts (nd->path.mnt,dentry)
into *path and returns 0.  Make it return ERR_PTR(-E...) or
dentry; adjust the caller.  Fewer arguments and it's easier
to keep track of *path contents that way.

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent bd7c4b50

fs/namei.c

+24 −17
Original line number Diff line number Diff line
@@ -3087,8 +3087,8 @@ static int may_o_create(const struct path *dir, struct dentry *dentry, umode_t m 
 *

 * Returns an error code otherwise.

 */

static int atomic_open(struct nameidata *nd, struct dentry *dentry,

			struct path *path, struct file *file,

static struct dentry *atomic_open(struct nameidata *nd, struct dentry *dentry,

				  struct file *file,

				  const struct open_flags *op,

				  int open_flag, umode_t mode)

{
@@ -3131,17 +3131,15 @@ static int atomic_open(struct nameidata *nd, struct dentry *dentry, 
			}

			if (file->f_mode & FMODE_CREATED)

				fsnotify_create(dir, dentry);

			if (unlikely(d_is_negative(dentry))) {

			if (unlikely(d_is_negative(dentry)))

				error = -ENOENT;

			} else {

				path->dentry = dentry;

				path->mnt = nd->path.mnt;

				return 0;

			}

		}

	}

	if (error) {

		dput(dentry);

	return error;

		dentry = ERR_PTR(error);

	}

	return dentry;

}



/*
@@ -3236,12 +3234,21 @@ static int lookup_open(struct nameidata *nd, struct path *path, 
	}



	if (dir_inode->i_op->atomic_open) {

		error = atomic_open(nd, dentry, path, file, op, open_flag,

				    mode);

		dentry = atomic_open(nd, dentry, file, op, open_flag, mode);

		if (IS_ERR(dentry)) {

			error = PTR_ERR(dentry);

			if (unlikely(error == -ENOENT) && create_error)

				error = create_error;

			return error;

		}

		if (file->f_mode & FMODE_OPENED) {

			dput(dentry);

			return 0;

		}

		path->mnt = nd->path.mnt;

		path->dentry = dentry;

		return 0;

	}



no_open:

	if (d_in_lookup(dentry)) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE