Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cdb70f3f authored by Dave Hansen's avatar Dave Hansen Committed by Al Viro
Browse files

[PATCH] r/o bind mounts: write counts for touch_atime() 



Remove handling of NULL mnt while we are at it - that can't happen these days.

Acked-by: default avatarAl Viro <viro@ZenIV.linux.org.uk>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarDave Hansen <haveblue@us.ibm.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent a761a1c0

fs/inode.c

+20 −25
Original line number Diff line number Diff line
@@ -1199,42 +1199,37 @@ void touch_atime(struct vfsmount *mnt, struct dentry *dentry) 
	struct inode *inode = dentry->d_inode;

	struct timespec now;



	if (inode->i_flags & S_NOATIME)

	if (mnt_want_write(mnt))

		return;

	if (inode->i_flags & S_NOATIME)

		goto out;

	if (IS_NOATIME(inode))

		return;

		goto out;

	if ((inode->i_sb->s_flags & MS_NODIRATIME) && S_ISDIR(inode->i_mode))

		return;

		goto out;



	/*

	 * We may have a NULL vfsmount when coming from NFSD

	 */

	if (mnt) {

	if (mnt->mnt_flags & MNT_NOATIME)

			return;

		goto out;

	if ((mnt->mnt_flags & MNT_NODIRATIME) && S_ISDIR(inode->i_mode))

			return;



		goto out;

	if (mnt->mnt_flags & MNT_RELATIME) {

		/*

			 * With relative atime, only update atime if the

			 * previous atime is earlier than either the ctime or

			 * mtime.

		 * With relative atime, only update atime if the previous

		 * atime is earlier than either the ctime or mtime.

		 */

			if (timespec_compare(&inode->i_mtime,

						&inode->i_atime) < 0 &&

			    timespec_compare(&inode->i_ctime,

						&inode->i_atime) < 0)

				return;

		}

		if (timespec_compare(&inode->i_mtime, &inode->i_atime) < 0 &&

		    timespec_compare(&inode->i_ctime, &inode->i_atime) < 0)

			goto out;

	}



	now = current_fs_time(inode->i_sb);

	if (timespec_equal(&inode->i_atime, &now))

		return;

		goto out;



	inode->i_atime = now;

	mark_inode_dirty_sync(inode);

out:

	mnt_drop_write(mnt);

}

EXPORT_SYMBOL(touch_atime);