Commit b07d5cc9 authored by Amir Goldstein's avatar Amir Goldstein
Browse files

ovl: update of dentry revalidate flags after copy up 



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: bccece1e ("ovl: allow remote upper")
Reviewed-by: default avatarGao Xiang <hsiangkao@linux.alibaba.com>
Signed-off-by: default avatarAmir Goldstein <amir73il@gmail.com>
Signed-off-by: default avatarMiklos Szeredi <mszeredi@redhat.com>
parent f4e19e59

fs/overlayfs/copy_up.c

+2 −0
Original line number Diff line number Diff line
@@ -575,6 +575,7 @@ static int ovl_link_up(struct ovl_copy_up_ctx *c) 
			/* Restore timestamps on parent (best effort) */

			ovl_set_timestamps(ofs, upperdir, &c->pstat);

			ovl_dentry_set_upper_alias(c->dentry);

			ovl_dentry_update_reval(c->dentry, upper);

		}

	}

	inode_unlock(udir);
@@ -894,6 +895,7 @@ static int ovl_do_copy_up(struct ovl_copy_up_ctx *c) 
		inode_unlock(udir);



		ovl_dentry_set_upper_alias(c->dentry);

		ovl_dentry_update_reval(c->dentry, ovl_dentry_upper(c->dentry));

	}



out:

fs/overlayfs/dir.c

+1 −2
Original line number Diff line number Diff line
@@ -269,8 +269,7 @@ static int ovl_instantiate(struct dentry *dentry, struct inode *inode, 


	ovl_dir_modified(dentry->d_parent, false);

	ovl_dentry_set_upper_alias(dentry);

	ovl_dentry_update_reval(dentry, newdentry,

			DCACHE_OP_REVALIDATE | DCACHE_OP_WEAK_REVALIDATE);

	ovl_dentry_init_reval(dentry, newdentry);



	if (!hardlink) {

		/*

fs/overlayfs/export.c

+1 −2
Original line number Diff line number Diff line
@@ -326,8 +326,7 @@ static struct dentry *ovl_obtain_alias(struct super_block *sb, 
	if (upper_alias)

		ovl_dentry_set_upper_alias(dentry);



	ovl_dentry_update_reval(dentry, upper,

			DCACHE_OP_REVALIDATE | DCACHE_OP_WEAK_REVALIDATE);

	ovl_dentry_init_reval(dentry, upper);



	return d_instantiate_anon(dentry, inode);

fs/overlayfs/namei.c

+1 −2
Original line number Diff line number Diff line
@@ -1122,8 +1122,7 @@ struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry, 
			ovl_set_flag(OVL_UPPERDATA, inode);

	}



	ovl_dentry_update_reval(dentry, upperdentry,

			DCACHE_OP_REVALIDATE | DCACHE_OP_WEAK_REVALIDATE);

	ovl_dentry_init_reval(dentry, upperdentry);



	revert_creds(old_cred);

	if (origin_path) {

fs/overlayfs/overlayfs.h

+4 −2
Original line number Diff line number Diff line
@@ -375,7 +375,9 @@ bool ovl_index_all(struct super_block *sb); 
bool ovl_verify_lower(struct super_block *sb);

struct ovl_entry *ovl_alloc_entry(unsigned int numlower);

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);

bool ovl_dentry_weird(struct dentry *dentry);

enum ovl_path_type ovl_path_type(struct dentry *dentry);