Merge branch 'dmi/master'

[deliverable/linux.git] / fs / inode.c

diff --git a/fs/inode.c b/fs/inode.c
index ad445542c2858f5d622386bb58e725c4c11ae38d..fd604c0cb598a7b7d4d60815221c6c7fcdd87d0f 100644 (file)
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -1535,17 +1535,37 @@ 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)
+{
+       if (!rcu) {
+               struct inode *realinode = d_real_inode(dentry);
+
+               if (unlikely(inode != realinode)) {
+                       inode->i_mtime = realinode->i_mtime;
+                       inode->i_ctime = realinode->i_ctime;
+                       WARN_ON_ONCE(!timespec_equal(&inode->i_atime,
+                                                    &realinode->i_atime));
+               }
+       }
+}
+
 /*
  * 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(struct vfsmount *mnt, struct inode *inode,
-                            struct timespec now)
+static int relatime_need_update(const struct path *path, struct inode *inode,
+                               struct timespec now, bool rcu)
 {
 
-       if (!(mnt->mnt_flags & MNT_RELATIME))
+       if (!(path->mnt->mnt_flags & MNT_RELATIME))
                return 1;
+
+       update_ovl_inode_times(path->dentry, inode, rcu);
        /*
         * Is mtime younger than atime? If yes, update atime:
         */
@@ -1612,7 +1632,8 @@ static int update_time(struct inode *inode, struct timespec *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)
+static bool __atime_needs_update(const struct path *path, struct inode *inode,
+                                bool rcu)
 {
        struct vfsmount *mnt = path->mnt;
        struct timespec now;
@@ -1638,7 +1659,7 @@ bool atime_needs_update(const struct path *path, struct inode *inode)
 
        now = current_fs_time(inode->i_sb);
 
-       if (!relatime_need_update(mnt, inode, now))
+       if (!relatime_need_update(path, inode, now, rcu))
                return false;
 
        if (timespec_equal(&inode->i_atime, &now))
@@ -1647,13 +1668,18 @@ bool atime_needs_update(const struct path *path, struct inode *inode)
        return true;
 }
 
+bool atime_needs_update(const struct path *path, struct inode *inode)
+{
+       return __atime_needs_update(path, inode, true);
+}
+
 void touch_atime(const struct path *path)
 {
        struct vfsmount *mnt = path->mnt;
        struct inode *inode = d_inode(path->dentry);
        struct timespec now;
 
-       if (!atime_needs_update(path, inode))
+       if (!__atime_needs_update(path, inode, false))
                return;
 
        if (!sb_start_write_trylock(inode->i_sb))
@@ -1729,7 +1755,6 @@ int dentry_needs_remove_privs(struct dentry *dentry)
                mask |= ATTR_KILL_PRIV;
        return mask;
 }
-EXPORT_SYMBOL(dentry_needs_remove_privs);
 
 static int __remove_privs(struct dentry *dentry, int kill)
 {
@@ -1749,8 +1774,8 @@ static int __remove_privs(struct dentry *dentry, int kill)
  */
 int file_remove_privs(struct file *file)
 {
-       struct dentry *dentry = file->f_path.dentry;
-       struct inode *inode = d_inode(dentry);
+       struct dentry *dentry = file_dentry(file);
+       struct inode *inode = file_inode(file);
        int kill;
        int error = 0;
 
@@ -1758,7 +1783,7 @@ int file_remove_privs(struct file *file)
        if (IS_NOSEC(inode))
                return 0;
 
-       kill = file_needs_remove_privs(file);
+       kill = dentry_needs_remove_privs(dentry);
        if (kill < 0)
                return kill;
        if (kill)