Btrfs: fix infinite loop on inode eviction after deduplication of eof block

[sfrench/cifs-2.6.git] / fs / inode.c

diff --git a/fs/inode.c b/fs/inode.c
index a06de44542325a2848a3882774df0959d1dfa17b..42f6d25f32a52048199bdcf138bc23a698e69666 100644 (file)
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -1595,50 +1595,17 @@ sector_t bmap(struct inode *inode, sector_t block)
 }
 EXPORT_SYMBOL(bmap);
 
-/*
- * Update times in overlayed inode from underlying real inode
- */
-static void update_ovl_inode_times(struct dentry *dentry, struct inode *inode,
-                              bool rcu)
-{
-       struct dentry *upperdentry;
-
-       /*
-        * 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) ||
-                    !timespec64_equal(&inode->i_ctime, &realinode->i_ctime))) {
-                       inode->i_mtime = realinode->i_mtime;
-                       inode->i_ctime = realinode->i_ctime;
-               }
-       }
-}
-
 /*
  * With relative atime, only update atime if the previous atime is
  * earlier than either the ctime or mtime or if at least a day has
  * passed since the last atime update.
  */
-static int relatime_need_update(const struct path *path, struct inode *inode,
-                               struct timespec now, bool rcu)
+static int relatime_need_update(struct vfsmount *mnt, struct inode *inode,
+                            struct timespec now)
 {
 
-       if (!(path->mnt->mnt_flags & MNT_RELATIME))
+       if (!(mnt->mnt_flags & MNT_RELATIME))
                return 1;
-
-       update_ovl_inode_times(path->dentry, inode, rcu);
        /*
         * Is mtime younger than atime? If yes, update atime:
         */
@@ -1709,8 +1676,7 @@ static int update_time(struct inode *inode, struct timespec64 *time, int flags)
  *     This function automatically handles read only file systems and media,
  *     as well as the "noatime" flag and inode specific "noatime" markers.
  */
-bool __atime_needs_update(const struct path *path, struct inode *inode,
-                         bool rcu)
+bool atime_needs_update(const struct path *path, struct inode *inode)
 {
        struct vfsmount *mnt = path->mnt;
        struct timespec64 now;
@@ -1736,7 +1702,7 @@ bool __atime_needs_update(const struct path *path, struct inode *inode,
 
        now = current_time(inode);
 
-       if (!relatime_need_update(path, inode, timespec64_to_timespec(now), rcu))
+       if (!relatime_need_update(mnt, inode, timespec64_to_timespec(now)))
                return false;
 
        if (timespec64_equal(&inode->i_atime, &now))
@@ -1751,7 +1717,7 @@ void touch_atime(const struct path *path)
        struct inode *inode = d_inode(path->dentry);
        struct timespec64 now;
 
-       if (!__atime_needs_update(path, inode, false))
+       if (!atime_needs_update(path, inode))
                return;
 
        if (!sb_start_write_trylock(inode->i_sb))