Commit 88059de1 authored by Miklos Szeredi's avatar Miklos Szeredi

Revert "ovl: fix relatime for directories"

This reverts commit cd91304e.

Overlayfs no longer relies on the vfs correct atime handling.
Signed-off-by: default avatarMiklos Szeredi <mszeredi@redhat.com>
parent a6795a58
...@@ -1560,24 +1560,11 @@ EXPORT_SYMBOL(bmap); ...@@ -1560,24 +1560,11 @@ EXPORT_SYMBOL(bmap);
static void update_ovl_inode_times(struct dentry *dentry, struct inode *inode, static void update_ovl_inode_times(struct dentry *dentry, struct inode *inode,
bool rcu) bool rcu)
{ {
struct dentry *upperdentry; if (!rcu) {
struct inode *realinode = d_real_inode(dentry);
/* if (unlikely(inode != realinode) &&
* Nothing to do if in rcu or if non-overlayfs (!timespec64_equal(&inode->i_mtime, &realinode->i_mtime) ||
*/
if (rcu || likely(!(dentry->d_flags & DCACHE_OP_REAL)))
return;
upperdentry = d_real(dentry, NULL, 0, D_REAL_UPPER);
/*
* If file is on lower then we can't update atime, so no worries about
* stale mtime/ctime.
*/
if (upperdentry) {
struct inode *realinode = d_inode(upperdentry);
if ((!timespec64_equal(&inode->i_mtime, &realinode->i_mtime) ||
!timespec64_equal(&inode->i_ctime, &realinode->i_ctime))) { !timespec64_equal(&inode->i_ctime, &realinode->i_ctime))) {
inode->i_mtime = realinode->i_mtime; inode->i_mtime = realinode->i_mtime;
inode->i_ctime = realinode->i_ctime; inode->i_ctime = realinode->i_ctime;
......
...@@ -101,9 +101,6 @@ static struct dentry *ovl_d_real(struct dentry *dentry, ...@@ -101,9 +101,6 @@ static struct dentry *ovl_d_real(struct dentry *dentry,
if (inode && d_inode(dentry) == inode) if (inode && d_inode(dentry) == inode)
return dentry; return dentry;
if (flags & D_REAL_UPPER)
return ovl_dentry_upper(dentry);
if (!d_is_reg(dentry)) { if (!d_is_reg(dentry)) {
if (!inode || inode == d_inode(dentry)) if (!inode || inode == d_inode(dentry))
return dentry; return dentry;
......
...@@ -564,9 +564,6 @@ static inline struct dentry *d_backing_dentry(struct dentry *upper) ...@@ -564,9 +564,6 @@ static inline struct dentry *d_backing_dentry(struct dentry *upper)
return upper; return upper;
} }
/* d_real() flags */
#define D_REAL_UPPER 0x2 /* return upper dentry or NULL if non-upper */
/** /**
* d_real - Return the real dentry * d_real - Return the real dentry
* @dentry: the dentry to query * @dentry: the dentry to query
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment