Revert "ovl: fix relatime for directories" (88059de1) · Commits · 戴 / test

fs/inode.c

+4 −17

Original line number	Diff line number	Diff line
		@@ -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;

+0 −3

Original line number	Diff line number	Diff line
		@@ -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;

+0 −3

Original line number	Diff line number	Diff line
		@@ -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