Unverified Commit d6ef072d authored by Christian Brauner's avatar Christian Brauner
Browse files

ovl: reflow ovl_create_or_link() 

Reflow the creation routine in preparation of porting it to a guard.

Link: https://patch.msgid.link/20251117-work-ovl-cred-guard-prepare-v2-3-bd1c97a36d7b@kernel.org


Reviewed-by: default avatarAmir Goldstein <amir73il@gmail.com>
Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parent 8d7fc461

fs/overlayfs/dir.c

+30 −21
Original line number Diff line number Diff line
@@ -650,6 +650,16 @@ static const struct cred *ovl_setup_cred_for_create(struct dentry *dentry, 
	return override_cred;

}



static int ovl_create_handle_whiteouts(struct dentry *dentry,

				       struct inode *inode,

				       struct ovl_cattr *attr)

{

	if (!ovl_dentry_is_whiteout(dentry))

		return ovl_create_upper(dentry, inode, attr);



	return ovl_create_over_whiteout(dentry, inode, attr);

}



static int ovl_create_or_link(struct dentry *dentry, struct inode *inode,

			      struct ovl_cattr *attr, bool origin)

{
@@ -668,7 +678,6 @@ static int ovl_create_or_link(struct dentry *dentry, struct inode *inode, 
				return err;

		}



		if (!attr->hardlink) {

		/*

		 * In the creation cases(create, mkdir, mknod, symlink),

		 * ovl should transfer current's fs{u,g}id to underlying
@@ -682,15 +691,15 @@ static int ovl_create_or_link(struct dentry *dentry, struct inode *inode, 
		 * create a new inode, so just use the ovl mounter's

		 * fs{u,g}id.

		 */



		if (attr->hardlink)

			return ovl_create_handle_whiteouts(dentry, inode, attr);



		new_cred = ovl_setup_cred_for_create(dentry, inode, attr->mode, old_cred);

		if (IS_ERR(new_cred))

			return PTR_ERR(new_cred);

		}



		if (!ovl_dentry_is_whiteout(dentry))

			return ovl_create_upper(dentry, inode, attr);



		return ovl_create_over_whiteout(dentry, inode, attr);

		return ovl_create_handle_whiteouts(dentry, inode, attr);

	}

	return err;

}