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

Commit d9854c87 authored by Miklos Szeredi's avatar Miklos Szeredi
Browse files

ovl: copy up times 



Copy up mtime and ctime to overlay inode after times in real object are
modified.  Be careful not to dirty cachelines when not necessary.

This is in preparation for moving overlay functionality out of the VFS.

This patch shouldn't have any observable effect.

Signed-off-by: default avatarMiklos Szeredi <mszeredi@redhat.com>
parent f1825366

fs/overlayfs/dir.c

+24 −7
Original line number Original line Diff line number Diff line
@@ -242,7 +242,7 @@ static int ovl_instantiate(struct dentry *dentry, struct inode *inode, 
		.newinode = inode,

		.newinode = inode,

	};

	};





	ovl_dentry_version_inc(dentry->d_parent, false);

	ovl_dir_modified(dentry->d_parent, false);

	ovl_dentry_set_upper_alias(dentry);

	ovl_dentry_set_upper_alias(dentry);

	if (!hardlink) {

	if (!hardlink) {

		/*

		/*
@@ -722,7 +722,7 @@ static int ovl_remove_and_whiteout(struct dentry *dentry, 
	if (err)

	if (err)

		goto out_d_drop;

		goto out_d_drop;





	ovl_dentry_version_inc(dentry->d_parent, true);

	ovl_dir_modified(dentry->d_parent, true);

out_d_drop:

out_d_drop:

	d_drop(dentry);

	d_drop(dentry);

out_dput_upper:

out_dput_upper:
@@ -767,7 +767,7 @@ static int ovl_remove_upper(struct dentry *dentry, bool is_dir, 
		err = vfs_rmdir(dir, upper);

		err = vfs_rmdir(dir, upper);

	else

	else

		err = vfs_unlink(dir, upper, NULL);

		err = vfs_unlink(dir, upper, NULL);

	ovl_dentry_version_inc(dentry->d_parent, ovl_type_origin(dentry));

	ovl_dir_modified(dentry->d_parent, ovl_type_origin(dentry));





	/*

	/*

	 * Keeping this dentry hashed would mean having to release

	 * Keeping this dentry hashed would mean having to release
@@ -797,6 +797,7 @@ static int ovl_do_remove(struct dentry *dentry, bool is_dir) 
	int err;

	int err;

	bool locked = false;

	bool locked = false;

	const struct cred *old_cred;

	const struct cred *old_cred;

	struct dentry *upperdentry;

	bool lower_positive = ovl_lower_positive(dentry);

	bool lower_positive = ovl_lower_positive(dentry);

	LIST_HEAD(list);

	LIST_HEAD(list);
@@ -832,6 +833,17 @@ static int ovl_do_remove(struct dentry *dentry, bool is_dir) 
			drop_nlink(dentry->d_inode);

			drop_nlink(dentry->d_inode);

	}

	}

	ovl_nlink_end(dentry, locked);

	ovl_nlink_end(dentry, locked);



	/*

	 * Copy ctime

	 *

	 * Note: we fail to update ctime if there was no copy-up, only a

	 * whiteout

	 */

	upperdentry = ovl_dentry_upper(dentry);

	if (upperdentry)

		ovl_copyattr(d_inode(upperdentry), d_inode(dentry));



out_drop_write:

out_drop_write:

	ovl_drop_write(dentry);

	ovl_drop_write(dentry);

out:

out:
@@ -1138,11 +1150,16 @@ static int ovl_rename(struct inode *olddir, struct dentry *old, 
			drop_nlink(d_inode(new));

			drop_nlink(d_inode(new));

	}

	}





	ovl_dentry_version_inc(old->d_parent, ovl_type_origin(old) ||

	ovl_dir_modified(old->d_parent, ovl_type_origin(old) ||

			 (!overwrite && ovl_type_origin(new)));

			 (!overwrite && ovl_type_origin(new)));

	ovl_dentry_version_inc(new->d_parent, ovl_type_origin(old) ||

	ovl_dir_modified(new->d_parent, ovl_type_origin(old) ||

			 (d_inode(new) && ovl_type_origin(new)));

			 (d_inode(new) && ovl_type_origin(new)));





	/* copy ctime: */

	ovl_copyattr(d_inode(olddentry), d_inode(old));

	if (d_inode(new) && ovl_dentry_upper(new))

		ovl_copyattr(d_inode(newdentry), d_inode(new));



out_dput:

out_dput:

	dput(newdentry);

	dput(newdentry);

out_dput_old:

out_dput_old:

fs/overlayfs/inode.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -304,6 +304,9 @@ int ovl_xattr_set(struct dentry *dentry, struct inode *inode, const char *name, 
	}

	}

	revert_creds(old_cred);

	revert_creds(old_cred);





	/* copy c/mtime */

	ovl_copyattr(d_inode(realdentry), inode);



out_drop_write:

out_drop_write:

	ovl_drop_write(dentry);

	ovl_drop_write(dentry);

out:

out:

fs/overlayfs/overlayfs.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -231,7 +231,7 @@ void ovl_dentry_set_redirect(struct dentry *dentry, const char *redirect); 
void ovl_inode_init(struct inode *inode, struct dentry *upperdentry,

void ovl_inode_init(struct inode *inode, struct dentry *upperdentry,

		    struct dentry *lowerdentry);

		    struct dentry *lowerdentry);

void ovl_inode_update(struct inode *inode, struct dentry *upperdentry);

void ovl_inode_update(struct inode *inode, struct dentry *upperdentry);

void ovl_dentry_version_inc(struct dentry *dentry, bool impurity);

void ovl_dir_modified(struct dentry *dentry, bool impurity);

u64 ovl_dentry_version_get(struct dentry *dentry);

u64 ovl_dentry_version_get(struct dentry *dentry);

bool ovl_is_whiteout(struct dentry *dentry);

bool ovl_is_whiteout(struct dentry *dentry);

struct file *ovl_path_open(struct path *path, int flags);

struct file *ovl_path_open(struct path *path, int flags);

fs/overlayfs/util.c

+9 −1
Original line number Original line Diff line number Diff line
@@ -333,7 +333,7 @@ void ovl_inode_update(struct inode *inode, struct dentry *upperdentry) 
	}

	}

}

}





void ovl_dentry_version_inc(struct dentry *dentry, bool impurity)

static void ovl_dentry_version_inc(struct dentry *dentry, bool impurity)

{

{

	struct inode *inode = d_inode(dentry);

	struct inode *inode = d_inode(dentry);
@@ -348,6 +348,14 @@ void ovl_dentry_version_inc(struct dentry *dentry, bool impurity) 
		OVL_I(inode)->version++;

		OVL_I(inode)->version++;

}

}





void ovl_dir_modified(struct dentry *dentry, bool impurity)

{

	/* Copy mtime/ctime */

	ovl_copyattr(d_inode(ovl_dentry_upper(dentry)), d_inode(dentry));



	ovl_dentry_version_inc(dentry, impurity);

}



u64 ovl_dentry_version_get(struct dentry *dentry)

u64 ovl_dentry_version_get(struct dentry *dentry)

{

{

	struct inode *inode = d_inode(dentry);

	struct inode *inode = d_inode(dentry);