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

Commit 137ec526 authored by Amir Goldstein's avatar Amir Goldstein Committed by Miklos Szeredi
Browse files

ovl: create helper ovl_create_temp() 



Also used ovl_create_temp() in ovl_create_index() instead of calling
ovl_do_mkdir() directly, so now all callers of ovl_do_mkdir() are routed
through ovl_create_real(), which paves the way for Al's fix for non-hashed
result from vfs_mkdir().

Signed-off-by: default avatarAmir Goldstein <amir73il@gmail.com>
Signed-off-by: default avatarMiklos Szeredi <mszeredi@redhat.com>
parent 95a1c815

fs/overlayfs/copy_up.c

+4 −10
Original line number Diff line number Diff line
@@ -365,14 +365,10 @@ static int ovl_create_index(struct dentry *dentry, struct dentry *origin, 
	if (err)

		return err;



	temp = ovl_lookup_temp(indexdir);

	temp = ovl_create_temp(indexdir, OVL_CATTR(S_IFDIR | 0));

	if (IS_ERR(temp))

		goto temp_err;



	err = ovl_do_mkdir(dir, temp, S_IFDIR);

	if (err)

		goto out;



	err = ovl_set_upper_fh(upper, temp);

	if (err)

		goto out_cleanup;
@@ -500,12 +496,10 @@ static int ovl_get_tmpfile(struct ovl_copy_up_ctx *c, struct dentry **tempp) 
	if (new_creds)

		old_creds = override_creds(new_creds);



	if (c->tmpfile) {

	if (c->tmpfile)

		temp = ovl_do_tmpfile(c->workdir, c->stat.mode);

	} else {

		temp = ovl_create_real(d_inode(c->workdir),

				       ovl_lookup_temp(c->workdir), &cattr);

	}

	else

		temp = ovl_create_temp(c->workdir, &cattr);

	if (IS_ERR(temp))

		goto temp_err;

	err = 0;

fs/overlayfs/dir.c

+9 −4
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ int ovl_cleanup(struct inode *wdir, struct dentry *wdentry) 
	return err;

}



struct dentry *ovl_lookup_temp(struct dentry *workdir)

static struct dentry *ovl_lookup_temp(struct dentry *workdir)

{

	struct dentry *temp;

	char name[20];
@@ -169,6 +169,12 @@ struct dentry *ovl_create_real(struct inode *dir, struct dentry *newdentry, 
	return newdentry;

}



struct dentry *ovl_create_temp(struct dentry *workdir, struct ovl_cattr *attr)

{

	return ovl_create_real(d_inode(workdir), ovl_lookup_temp(workdir),

			       attr);

}



static int ovl_set_opaque_xerr(struct dentry *dentry, struct dentry *upper,

			       int xerr)

{
@@ -287,8 +293,7 @@ static struct dentry *ovl_clear_empty(struct dentry *dentry, 
	if (upper->d_parent->d_inode != udir)

		goto out_unlock;



	opaquedir = ovl_create_real(wdir, ovl_lookup_temp(workdir),

				    OVL_CATTR(stat.mode));

	opaquedir = ovl_create_temp(workdir, OVL_CATTR(stat.mode));

	err = PTR_ERR(opaquedir);

	if (IS_ERR(opaquedir))

		goto out_unlock;
@@ -388,7 +393,7 @@ static int ovl_create_over_whiteout(struct dentry *dentry, struct inode *inode, 
	if (IS_ERR(upper))

		goto out_unlock;



	newdentry = ovl_create_real(wdir, ovl_lookup_temp(workdir), cattr);

	newdentry = ovl_create_temp(workdir, cattr);

	err = PTR_ERR(newdentry);

	if (IS_ERR(newdentry))

		goto out_dput;

fs/overlayfs/overlayfs.h

+1 −1
Original line number Diff line number Diff line
@@ -346,7 +346,6 @@ static inline void ovl_copyattr(struct inode *from, struct inode *to) 


/* dir.c */

extern const struct inode_operations ovl_dir_inode_operations;

struct dentry *ovl_lookup_temp(struct dentry *workdir);

int ovl_cleanup_and_whiteout(struct dentry *workdir, struct inode *dir,

			     struct dentry *dentry);

struct ovl_cattr {
@@ -361,6 +360,7 @@ struct ovl_cattr { 
struct dentry *ovl_create_real(struct inode *dir, struct dentry *newdentry,

			       struct ovl_cattr *attr);

int ovl_cleanup(struct inode *dir, struct dentry *dentry);

struct dentry *ovl_create_temp(struct dentry *workdir, struct ovl_cattr *attr);



/* copy_up.c */

int ovl_copy_up(struct dentry *dentry);