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>

diff --git a/fs/inode.c b/fs/inode.c
index 2c300e98179607ea0062a2c1dbcee17e9bc926c4..7ef6f19427579fd42a77bfd917d5de6f6595526f 100644 (file)
--- 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 211975921a90d51830bb17e7f3bac1437d606093..a7e2287e4b8f6c7ca3180015521dac544dde13d4 100644 (file)
--- 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 66c6e17e61e5af907b1c8bec24021f22aa819824..ddae4103d3247524e6616b482bb1fd8c4c6c1876 100644 (file)
--- 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