Skip to content

Commit

Permalink
ovl: fix relatime for directories
Browse files Browse the repository at this point in the history
Need to treat non-regular overlayfs files the same as regular files when
checking for an atime update.

Add a d_real() flag to make it return the upper dentry for all file types.

Reported-by: "zhangyi (F)" <yi.zhang@huawei.com>
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
  • Loading branch information
Miklos Szeredi committed Sep 5, 2017
1 parent 495e642 commit cd91304
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 4 deletions.
21 changes: 17 additions & 4 deletions fs/inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -1569,11 +1569,24 @@ EXPORT_SYMBOL(bmap);
static void update_ovl_inode_times(struct dentry *dentry, struct inode *inode,
bool rcu)
{
if (!rcu) {
struct inode *realinode = d_real_inode(dentry);
struct dentry *upperdentry;

if (unlikely(inode != realinode) &&
(!timespec_equal(&inode->i_mtime, &realinode->i_mtime) ||
/*
* 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 ((!timespec_equal(&inode->i_mtime, &realinode->i_mtime) ||
!timespec_equal(&inode->i_ctime, &realinode->i_ctime))) {
inode->i_mtime = realinode->i_mtime;
inode->i_ctime = realinode->i_ctime;
Expand Down
3 changes: 3 additions & 0 deletions fs/overlayfs/super.c
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,9 @@ static struct dentry *ovl_d_real(struct dentry *dentry,
struct dentry *real;
int err;

if (flags & D_REAL_UPPER)
return ovl_dentry_upper(dentry);

if (!d_is_reg(dentry)) {
if (!inode || inode == d_inode(dentry))
return dentry;
Expand Down
3 changes: 3 additions & 0 deletions include/linux/dcache.h
Original file line number Diff line number Diff line change
Expand Up @@ -562,6 +562,9 @@ 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
Expand Down

0 comments on commit cd91304

Please sign in to comment.