Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-10 22:21:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

ovl: create helper ovl_create_temp()

Browse Source 
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: Amir Goldstein <amir73il@gmail.com>
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
This commit is contained in:
Amir Goldstein 2018-05-16 17:51:25 +03:00 committed by Miklos Szeredi
parent 95a1c8153a
commit 137ec526a2
3 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fs/overlayfs/copy_up.c
View File

@ -365,14 +365,10 @@ static int ovl_create_index(struct dentry *dentry, struct dentry *origin,
if (err) if (err)
return err; return err;
temp = ovl_lookup_temp(indexdir); temp = ovl_create_temp(indexdir, OVL_CATTR(S_IFDIR | 0));
if (IS_ERR(temp)) if (IS_ERR(temp))
goto temp_err; goto temp_err;
err = ovl_do_mkdir(dir, temp, S_IFDIR);
if (err)
goto out;
err = ovl_set_upper_fh(upper, temp); err = ovl_set_upper_fh(upper, temp);
if (err) if (err)
goto out_cleanup; goto out_cleanup;
@ -500,12 +496,10 @@ static int ovl_get_tmpfile(struct ovl_copy_up_ctx *c, struct dentry **tempp)
if (new_creds) if (new_creds)
old_creds = override_creds(new_creds); old_creds = override_creds(new_creds);
if (c->tmpfile) { if (c->tmpfile)
temp = ovl_do_tmpfile(c->workdir, c->stat.mode); temp = ovl_do_tmpfile(c->workdir, c->stat.mode);
} else { else
temp = ovl_create_real(d_inode(c->workdir), temp = ovl_create_temp(c->workdir, &cattr);
ovl_lookup_temp(c->workdir), &cattr);
}
if (IS_ERR(temp)) if (IS_ERR(temp))
goto temp_err; goto temp_err;
err = 0; err = 0;

13
fs/overlayfs/dir.c
View File

@ -43,7 +43,7 @@ int ovl_cleanup(struct inode *wdir, struct dentry *wdentry)
return err; return err;
} }
struct dentry *ovl_lookup_temp(struct dentry *workdir) static struct dentry *ovl_lookup_temp(struct dentry *workdir)
{ {
struct dentry *temp; struct dentry *temp;
char name[20]; char name[20];
@ -169,6 +169,12 @@ out:
return 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, static int ovl_set_opaque_xerr(struct dentry *dentry, struct dentry *upper,
int xerr) int xerr)
{ {
@ -287,8 +293,7 @@ static struct dentry *ovl_clear_empty(struct dentry *dentry,
if (upper->d_parent->d_inode != udir) if (upper->d_parent->d_inode != udir)
goto out_unlock; goto out_unlock;
opaquedir = ovl_create_real(wdir, ovl_lookup_temp(workdir), opaquedir = ovl_create_temp(workdir, OVL_CATTR(stat.mode));
OVL_CATTR(stat.mode));
err = PTR_ERR(opaquedir); err = PTR_ERR(opaquedir);
if (IS_ERR(opaquedir)) if (IS_ERR(opaquedir))
goto out_unlock; goto out_unlock;
@ -388,7 +393,7 @@ static int ovl_create_over_whiteout(struct dentry *dentry, struct inode *inode,
if (IS_ERR(upper)) if (IS_ERR(upper))
goto out_unlock; goto out_unlock;
newdentry = ovl_create_real(wdir, ovl_lookup_temp(workdir), cattr); newdentry = ovl_create_temp(workdir, cattr);
err = PTR_ERR(newdentry); err = PTR_ERR(newdentry);
if (IS_ERR(newdentry)) if (IS_ERR(newdentry))
goto out_dput; goto out_dput;

2
fs/overlayfs/overlayfs.h
View File

@ -346,7 +346,6 @@ static inline void ovl_copyattr(struct inode *from, struct inode *to)
/* dir.c */ /* dir.c */
extern const struct inode_operations ovl_dir_inode_operations; 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, int ovl_cleanup_and_whiteout(struct dentry *workdir, struct inode *dir,
struct dentry *dentry); struct dentry *dentry);
struct ovl_cattr { struct ovl_cattr {
@ -361,6 +360,7 @@ struct ovl_cattr {
struct dentry *ovl_create_real(struct inode *dir, struct dentry *newdentry, struct dentry *ovl_create_real(struct inode *dir, struct dentry *newdentry,
struct ovl_cattr *attr); struct ovl_cattr *attr);
int ovl_cleanup(struct inode *dir, struct dentry *dentry); int ovl_cleanup(struct inode *dir, struct dentry *dentry);
struct dentry *ovl_create_temp(struct dentry *workdir, struct ovl_cattr *attr);
/* copy_up.c */ /* copy_up.c */
int ovl_copy_up(struct dentry *dentry); int ovl_copy_up(struct dentry *dentry);