Unverified Commit 85bbffca authored by Jeff Layton's avatar Jeff Layton Committed by Christian Brauner
Browse files

vfs: clean up argument list for vfs_create() 



As Neil points out:

"I would be in favour of dropping the "dir" arg because it is always
d_inode(dentry->d_parent) which is stable."

...and...

"Also *every* caller of vfs_create() passes ".excl = true".  So maybe we
don't need that arg at all."

Drop both arguments from vfs_create() and fix up the callers.

Reviewed-by: default avatarJan Kara <jack@suse.cz>
Reviewed-by: default avatarNeilBrown <neil@brown.name>
Signed-off-by: default avatarJeff Layton <jlayton@kernel.org>
Link: https://patch.msgid.link/20251111-dir-deleg-ro-v6-9-52f3feebb2f2@kernel.org


Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parent 134796f4

fs/ecryptfs/inode.c

+1 −2
Original line number Diff line number Diff line
@@ -188,8 +188,7 @@ ecryptfs_do_create(struct inode *directory_inode, 


	rc = lock_parent(ecryptfs_dentry, &lower_dentry, &lower_dir);

	if (!rc)

		rc = vfs_create(&nop_mnt_idmap, lower_dir,

				lower_dentry, mode, true);

		rc = vfs_create(&nop_mnt_idmap, lower_dentry, mode);

	if (rc) {

		printk(KERN_ERR "%s: Failure to create dentry in lower fs; "

		       "rc = [%d]\n", __func__, rc);

fs/namei.c

+4 −7
Original line number Diff line number Diff line
@@ -3461,10 +3461,8 @@ static inline umode_t vfs_prepare_mode(struct mnt_idmap *idmap, 
/**

 * vfs_create - create new file

 * @idmap:	idmap of the mount the inode was found from

 * @dir:	inode of the parent directory

 * @dentry:	dentry of the child file

 * @mode:	mode of the child file

 * @want_excl:	whether the file must not yet exist

 *

 * Create a new file.

 *
@@ -3474,9 +3472,9 @@ static inline umode_t vfs_prepare_mode(struct mnt_idmap *idmap, 
 * On non-idmapped mounts or if permission checking is to be performed on the

 * raw inode simply pass @nop_mnt_idmap.

 */

int vfs_create(struct mnt_idmap *idmap, struct inode *dir,

	       struct dentry *dentry, umode_t mode, bool want_excl)

int vfs_create(struct mnt_idmap *idmap, struct dentry *dentry, umode_t mode)

{

	struct inode *dir = d_inode(dentry->d_parent);

	int error;



	error = may_create(idmap, dir, dentry);
@@ -3490,7 +3488,7 @@ int vfs_create(struct mnt_idmap *idmap, struct inode *dir, 
	error = security_inode_create(dir, dentry, mode);

	if (error)

		return error;

	error = dir->i_op->create(idmap, dir, dentry, mode, want_excl);

	error = dir->i_op->create(idmap, dir, dentry, mode, true);

	if (!error)

		fsnotify_create(dir, dentry);

	return error;
@@ -4383,8 +4381,7 @@ static int do_mknodat(int dfd, struct filename *name, umode_t mode, 
	idmap = mnt_idmap(path.mnt);

	switch (mode & S_IFMT) {

		case 0: case S_IFREG:

			error = vfs_create(idmap, path.dentry->d_inode,

					   dentry, mode, true);

			error = vfs_create(idmap, dentry, mode);

			if (!error)

				security_path_post_mknod(idmap, dentry);

			break;

fs/nfsd/nfs3proc.c

+1 −1
Original line number Diff line number Diff line
@@ -344,7 +344,7 @@ nfsd3_create_file(struct svc_rqst *rqstp, struct svc_fh *fhp, 
	status = fh_fill_pre_attrs(fhp);

	if (status != nfs_ok)

		goto out;

	host_err = vfs_create(&nop_mnt_idmap, inode, child, iap->ia_mode, true);

	host_err = vfs_create(&nop_mnt_idmap, child, iap->ia_mode);

	if (host_err < 0) {

		status = nfserrno(host_err);

		goto out;

fs/nfsd/vfs.c

+1 −2
Original line number Diff line number Diff line
@@ -1552,8 +1552,7 @@ nfsd_create_locked(struct svc_rqst *rqstp, struct svc_fh *fhp, 
	err = 0;

	switch (type) {

	case S_IFREG:

		host_err = vfs_create(&nop_mnt_idmap, dirp, dchild,

				      iap->ia_mode, true);

		host_err = vfs_create(&nop_mnt_idmap, dchild, iap->ia_mode);

		if (!host_err)

			nfsd_check_ignore_resizing(iap);

		break;

fs/open.c

+1 −3
Original line number Diff line number Diff line
@@ -1171,9 +1171,7 @@ struct file *dentry_create(const struct path *path, int flags, umode_t mode, 
	if (IS_ERR(f))

		return f;



	error = vfs_create(mnt_idmap(path->mnt),

			   d_inode(path->dentry->d_parent),

			   path->dentry, mode, true);

	error = vfs_create(mnt_idmap(path->mnt), path->dentry, mode);

	if (!error)

		error = vfs_open(path, f);