leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ovl: fix relatime for directories

Browse Source 
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>
This commit is contained in:
Miklos Szeredi 2017-09-05 12:53:11 +02:00
parent 495e642939
commit cd91304e71
3 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
fs/inode.c
View File

@ -1569,11 +1569,24 @@ EXPORT_SYMBOL(bmap);
static void update_ovl_inode_times(struct dentry *dentry, struct inode *inode, static void update_ovl_inode_times(struct dentry *dentry, struct inode *inode,
bool rcu) bool rcu)
{ {
if (!rcu) { struct dentry *upperdentry;
struct inode *realinode = d_real_inode(dentry);
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))) { !timespec_equal(&inode->i_ctime, &realinode->i_ctime))) {
inode->i_mtime = realinode->i_mtime; inode->i_mtime = realinode->i_mtime;
inode->i_ctime = realinode->i_ctime; inode->i_ctime = realinode->i_ctime;

3
fs/overlayfs/super.c
View File

@ -75,6 +75,9 @@ static struct dentry *ovl_d_real(struct dentry *dentry,
struct dentry *real; struct dentry *real;
int err; int err;
if (flags & D_REAL_UPPER)
return ovl_dentry_upper(dentry);
if (!d_is_reg(dentry)) { if (!d_is_reg(dentry)) {
if (!inode || inode == d_inode(dentry)) if (!inode || inode == d_inode(dentry))
return dentry; return dentry;

3
include/linux/dcache.h
View File

@ -562,6 +562,9 @@ static inline struct dentry *d_backing_dentry(struct dentry *upper)
return 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 * d_real - Return the real dentry
* @dentry: the dentry to query * @dentry: the dentry to query