mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-29 22:02:02 +00:00
ovl: update of dentry revalidate flags after copy up
[ Upstream commitb07d5cc93e
] After copy up, we may need to update d_flags if upper dentry is on a remote fs and lower dentries are not. Add helpers to allow incremental update of the revalidate flags. Fixes:bccece1ead
("ovl: allow remote upper") Reviewed-by: Gao Xiang <hsiangkao@linux.alibaba.com> Signed-off-by: Amir Goldstein <amir73il@gmail.com> Signed-off-by: Miklos Szeredi <mszeredi@redhat.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
5397290815
commit
33ab4dd620
7 changed files with 30 additions and 13 deletions
|
@ -576,6 +576,7 @@ static int ovl_link_up(struct ovl_copy_up_ctx *c)
|
||||||
/* Restore timestamps on parent (best effort) */
|
/* Restore timestamps on parent (best effort) */
|
||||||
ovl_set_timestamps(ofs, upperdir, &c->pstat);
|
ovl_set_timestamps(ofs, upperdir, &c->pstat);
|
||||||
ovl_dentry_set_upper_alias(c->dentry);
|
ovl_dentry_set_upper_alias(c->dentry);
|
||||||
|
ovl_dentry_update_reval(c->dentry, upper);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
inode_unlock(udir);
|
inode_unlock(udir);
|
||||||
|
@ -895,6 +896,7 @@ static int ovl_do_copy_up(struct ovl_copy_up_ctx *c)
|
||||||
inode_unlock(udir);
|
inode_unlock(udir);
|
||||||
|
|
||||||
ovl_dentry_set_upper_alias(c->dentry);
|
ovl_dentry_set_upper_alias(c->dentry);
|
||||||
|
ovl_dentry_update_reval(c->dentry, ovl_dentry_upper(c->dentry));
|
||||||
}
|
}
|
||||||
|
|
||||||
out:
|
out:
|
||||||
|
|
|
@ -269,8 +269,7 @@ static int ovl_instantiate(struct dentry *dentry, struct inode *inode,
|
||||||
|
|
||||||
ovl_dir_modified(dentry->d_parent, false);
|
ovl_dir_modified(dentry->d_parent, false);
|
||||||
ovl_dentry_set_upper_alias(dentry);
|
ovl_dentry_set_upper_alias(dentry);
|
||||||
ovl_dentry_update_reval(dentry, newdentry,
|
ovl_dentry_init_reval(dentry, newdentry);
|
||||||
DCACHE_OP_REVALIDATE | DCACHE_OP_WEAK_REVALIDATE);
|
|
||||||
|
|
||||||
if (!hardlink) {
|
if (!hardlink) {
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -326,8 +326,7 @@ static struct dentry *ovl_obtain_alias(struct super_block *sb,
|
||||||
if (upper_alias)
|
if (upper_alias)
|
||||||
ovl_dentry_set_upper_alias(dentry);
|
ovl_dentry_set_upper_alias(dentry);
|
||||||
|
|
||||||
ovl_dentry_update_reval(dentry, upper,
|
ovl_dentry_init_reval(dentry, upper);
|
||||||
DCACHE_OP_REVALIDATE | DCACHE_OP_WEAK_REVALIDATE);
|
|
||||||
|
|
||||||
return d_instantiate_anon(dentry, inode);
|
return d_instantiate_anon(dentry, inode);
|
||||||
|
|
||||||
|
|
|
@ -1122,8 +1122,7 @@ struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry,
|
||||||
ovl_set_flag(OVL_UPPERDATA, inode);
|
ovl_set_flag(OVL_UPPERDATA, inode);
|
||||||
}
|
}
|
||||||
|
|
||||||
ovl_dentry_update_reval(dentry, upperdentry,
|
ovl_dentry_init_reval(dentry, upperdentry);
|
||||||
DCACHE_OP_REVALIDATE | DCACHE_OP_WEAK_REVALIDATE);
|
|
||||||
|
|
||||||
revert_creds(old_cred);
|
revert_creds(old_cred);
|
||||||
if (origin_path) {
|
if (origin_path) {
|
||||||
|
|
|
@ -375,7 +375,9 @@ bool ovl_index_all(struct super_block *sb);
|
||||||
bool ovl_verify_lower(struct super_block *sb);
|
bool ovl_verify_lower(struct super_block *sb);
|
||||||
struct ovl_entry *ovl_alloc_entry(unsigned int numlower);
|
struct ovl_entry *ovl_alloc_entry(unsigned int numlower);
|
||||||
bool ovl_dentry_remote(struct dentry *dentry);
|
bool ovl_dentry_remote(struct dentry *dentry);
|
||||||
void ovl_dentry_update_reval(struct dentry *dentry, struct dentry *upperdentry,
|
void ovl_dentry_update_reval(struct dentry *dentry, struct dentry *realdentry);
|
||||||
|
void ovl_dentry_init_reval(struct dentry *dentry, struct dentry *upperdentry);
|
||||||
|
void ovl_dentry_init_flags(struct dentry *dentry, struct dentry *upperdentry,
|
||||||
unsigned int mask);
|
unsigned int mask);
|
||||||
bool ovl_dentry_weird(struct dentry *dentry);
|
bool ovl_dentry_weird(struct dentry *dentry);
|
||||||
enum ovl_path_type ovl_path_type(struct dentry *dentry);
|
enum ovl_path_type ovl_path_type(struct dentry *dentry);
|
||||||
|
|
|
@ -1885,7 +1885,7 @@ static struct dentry *ovl_get_root(struct super_block *sb,
|
||||||
ovl_dentry_set_flag(OVL_E_CONNECTED, root);
|
ovl_dentry_set_flag(OVL_E_CONNECTED, root);
|
||||||
ovl_set_upperdata(d_inode(root));
|
ovl_set_upperdata(d_inode(root));
|
||||||
ovl_inode_init(d_inode(root), &oip, ino, fsid);
|
ovl_inode_init(d_inode(root), &oip, ino, fsid);
|
||||||
ovl_dentry_update_reval(root, upperdentry, DCACHE_OP_WEAK_REVALIDATE);
|
ovl_dentry_init_flags(root, upperdentry, DCACHE_OP_WEAK_REVALIDATE);
|
||||||
|
|
||||||
return root;
|
return root;
|
||||||
}
|
}
|
||||||
|
|
|
@ -94,13 +94,29 @@ struct ovl_entry *ovl_alloc_entry(unsigned int numlower)
|
||||||
return oe;
|
return oe;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#define OVL_D_REVALIDATE (DCACHE_OP_REVALIDATE | DCACHE_OP_WEAK_REVALIDATE)
|
||||||
|
|
||||||
bool ovl_dentry_remote(struct dentry *dentry)
|
bool ovl_dentry_remote(struct dentry *dentry)
|
||||||
{
|
{
|
||||||
return dentry->d_flags &
|
return dentry->d_flags & OVL_D_REVALIDATE;
|
||||||
(DCACHE_OP_REVALIDATE | DCACHE_OP_WEAK_REVALIDATE);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void ovl_dentry_update_reval(struct dentry *dentry, struct dentry *upperdentry,
|
void ovl_dentry_update_reval(struct dentry *dentry, struct dentry *realdentry)
|
||||||
|
{
|
||||||
|
if (!ovl_dentry_remote(realdentry))
|
||||||
|
return;
|
||||||
|
|
||||||
|
spin_lock(&dentry->d_lock);
|
||||||
|
dentry->d_flags |= realdentry->d_flags & OVL_D_REVALIDATE;
|
||||||
|
spin_unlock(&dentry->d_lock);
|
||||||
|
}
|
||||||
|
|
||||||
|
void ovl_dentry_init_reval(struct dentry *dentry, struct dentry *upperdentry)
|
||||||
|
{
|
||||||
|
return ovl_dentry_init_flags(dentry, upperdentry, OVL_D_REVALIDATE);
|
||||||
|
}
|
||||||
|
|
||||||
|
void ovl_dentry_init_flags(struct dentry *dentry, struct dentry *upperdentry,
|
||||||
unsigned int mask)
|
unsigned int mask)
|
||||||
{
|
{
|
||||||
struct ovl_entry *oe = OVL_E(dentry);
|
struct ovl_entry *oe = OVL_E(dentry);
|
||||||
|
|
Loading…
Reference in a new issue