redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

Revert "ovl: fix relatime for directories" 

This reverts commit cd91304e71.

Overlayfs no longer relies on the vfs correct atime handling.

Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
hifive-unleashed-5.1
Miklos Szeredi 2018-07-18 15:44:43 +02:00
parent a6795a5859
commit 88059de155
3 changed files with 4 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
fs/inode.c
View File

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

3
fs/overlayfs/super.c
View File

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

3
include/linux/dcache.h
View File

@ -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