diff options
| author | Miklos Szeredi <mszeredi@redhat.com> | 2018-07-18 15:44:43 +0200 |
|---|---|---|
| committer | Miklos Szeredi <mszeredi@redhat.com> | 2018-07-18 15:44:43 +0200 |
| commit | 88059de155d4db817a3a78ba899cb3b7f4de0fb0 (patch) | |
| tree | 21e666328a80e7069439565cca55c37387f42a47 | |
| parent | a6795a585929d94ca3e931bc8518f8deb8bbe627 (diff) | |
Revert "ovl: fix relatime for directories"
This reverts commit cd91304e7190b4c4802f8e413ab2214b233e0260.
Overlayfs no longer relies on the vfs correct atime handling.
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
| -rw-r--r-- | fs/inode.c | 21 | ||||
| -rw-r--r-- | fs/overlayfs/super.c | 3 | ||||
| -rw-r--r-- | include/linux/dcache.h | 3 |
3 files changed, 4 insertions, 23 deletions
diff --git a/fs/inode.c b/fs/inode.c index 2c300e981796..7ef6f1942757 100644 --- a/fs/inode.c +++ b/fs/inode.c @@ -1560,24 +1560,11 @@ EXPORT_SYMBOL(bmap); static void update_ovl_inode_times(struct dentry *dentry, struct inode *inode, bool rcu) { - struct dentry *upperdentry; + if (!rcu) { + struct inode *realinode = d_real_inode(dentry); - /* - * Nothing to do if in rcu or if non-overlayfs - */ - 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) || + if (unlikely(inode != realinode) && + (!timespec64_equal(&inode->i_mtime, &realinode->i_mtime) || !timespec64_equal(&inode->i_ctime, &realinode->i_ctime))) { inode->i_mtime = realinode->i_mtime; inode->i_ctime = realinode->i_ctime; diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c index 211975921a90..a7e2287e4b8f 100644 --- a/fs/overlayfs/super.c +++ b/fs/overlayfs/super.c @@ -101,9 +101,6 @@ static struct dentry *ovl_d_real(struct dentry *dentry, if (inode && d_inode(dentry) == inode) return dentry; - if (flags & D_REAL_UPPER) - return ovl_dentry_upper(dentry); - if (!d_is_reg(dentry)) { if (!inode || inode == d_inode(dentry)) return dentry; diff --git a/include/linux/dcache.h b/include/linux/dcache.h index 66c6e17e61e5..ddae4103d324 100644 --- a/include/linux/dcache.h +++ b/include/linux/dcache.h @@ -564,9 +564,6 @@ static inline struct dentry *d_backing_dentry(struct dentry *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 * @dentry: the dentry to query |