[PATCH 19/24] elevate write count for do_sys_utime() and touch_atime()

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Dave Hansen
Date: Monday, September 17, 2007 - 11:27 am

Signed-off-by: Dave Hansen <haveblue@us.ibm.com>
---

 lxc-dave/fs/inode.c |   20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff -puN fs/inode.c~elevate-write-count-for-do-sys-utime-and-touch-atime fs/inode.c
--- lxc/fs/inode.c~elevate-write-count-for-do-sys-utime-and-touch-atime	2007-09-17 09:44:07.000000000 -0700
+++ lxc-dave/fs/inode.c	2007-09-17 09:44:07.000000000 -0700
@@ -1185,22 +1185,23 @@ void touch_atime(struct vfsmount *mnt, s
 	struct inode *inode = dentry->d_inode;
 	struct timespec now;
 
-	if (inode->i_flags & S_NOATIME)
+	if (mnt && 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
@@ -1211,16 +1212,19 @@ void touch_atime(struct vfsmount *mnt, s
 						&inode->i_atime) < 0 &&
 			    timespec_compare(&inode->i_ctime,
 						&inode->i_atime) < 0)
-				return;
+				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:
+	if (mnt)
+		mnt_drop_write(mnt);
 }
 EXPORT_SYMBOL(touch_atime);
 
_
-
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH 00/24] Read-only bind mounts, Dave Hansen, (Mon Sep 17, 11:27 am)
[PATCH 02/24] rearrange may_open() to be r/o friendly, Dave Hansen, (Mon Sep 17, 11:27 am)
[PATCH 03/24] create cleanup helper svc_msnfs(), Dave Hansen, (Mon Sep 17, 11:27 am)
[PATCH 04/24] r/o bind mounts: stub functions, Dave Hansen, (Mon Sep 17, 11:27 am)
[PATCH 05/24] elevate write count open()'d files, Dave Hansen, (Mon Sep 17, 11:27 am)
[PATCH 08/24] make access() use mnt check, Dave Hansen, (Mon Sep 17, 11:27 am)
[PATCH 18/24] elevate write count for do_utimes(), Dave Hansen, (Mon Sep 17, 11:27 am)
[PATCH 19/24] elevate write count for do_sys_utime() and t ..., Dave Hansen, (Mon Sep 17, 11:27 am)
[PATCH 22/24] do_rmdir(): elevate write count, Dave Hansen, (Mon Sep 17, 11:27 am)
Re: [PATCH 00/24] Read-only bind mounts, Serge E. Hallyn, (Wed Sep 19, 7:21 am)
Re: [PATCH 01/24] filesystem helpers for custom 'struct file's, Christoph Hellwig, (Wed Sep 19, 10:26 am)
Re: [PATCH 02/24] rearrange may_open() to be r/o friendly, Christoph Hellwig, (Wed Sep 19, 10:27 am)
Re: [PATCH 03/24] create cleanup helper svc_msnfs(), Christoph Hellwig, (Wed Sep 19, 10:28 am)
Re: [PATCH 04/24] r/o bind mounts: stub functions, Christoph Hellwig, (Wed Sep 19, 10:28 am)
Re: [PATCH 05/24] elevate write count open()'d files, Christoph Hellwig, (Wed Sep 19, 10:30 am)
Re: [PATCH 06/24] r/o bind mounts: elevate write count for ..., Christoph Hellwig, (Wed Sep 19, 10:31 am)
Re: [PATCH 07/24] elevate writer count for chown and friends, Christoph Hellwig, (Wed Sep 19, 10:31 am)
Re: [PATCH 08/24] make access() use mnt check, Christoph Hellwig, (Wed Sep 19, 10:32 am)
Re: [PATCH 09/24] elevate mnt writers for callers of vfs_m ..., Christoph Hellwig, (Wed Sep 19, 10:32 am)
Re: [PATCH 10/24] elevate write count during entire ncp_io ..., Christoph Hellwig, (Wed Sep 19, 10:33 am)
Re: [PATCH 11/24] elevate write count for link and symlink ..., Christoph Hellwig, (Wed Sep 19, 10:33 am)
Re: [PATCH 12/24] elevate mount count for extended attributes, Christoph Hellwig, (Wed Sep 19, 10:34 am)
Re: [PATCH 13/24] elevate write count for file_update_time(), Christoph Hellwig, (Wed Sep 19, 10:35 am)
Re: [PATCH 14/24] unix_find_other() elevate write count fo ..., Christoph Hellwig, (Wed Sep 19, 10:35 am)
Re: [PATCH 15/24] elevate write count over calls to vfs_re ..., Christoph Hellwig, (Wed Sep 19, 10:35 am)
Re: [PATCH 16/24] nfs: check mnt instead of superblock dir ..., Christoph Hellwig, (Wed Sep 19, 10:36 am)
Re: [PATCH 17/24] elevate writer count for do_sys_truncate(), Christoph Hellwig, (Wed Sep 19, 10:36 am)
Re: [PATCH 18/24] elevate write count for do_utimes(), Christoph Hellwig, (Wed Sep 19, 10:36 am)
Re: [PATCH 19/24] elevate write count for do_sys_utime() a ..., Christoph Hellwig, (Wed Sep 19, 10:36 am)
Re: [PATCH 20/24] sys_mknodat(): elevate write count for v ..., Christoph Hellwig, (Wed Sep 19, 10:38 am)
Re: [PATCH 21/24] elevate mnt writers for vfs_unlink() callers, Christoph Hellwig, (Wed Sep 19, 10:38 am)
Re: [PATCH 22/24] do_rmdir(): elevate write count, Christoph Hellwig, (Wed Sep 19, 10:39 am)
Re: [PATCH 03/24] create cleanup helper svc_msnfs(), Jan Engelhardt, (Wed Sep 19, 10:39 am)
Re: [PATCH 00/24] Read-only bind mounts, Christoph Hellwig, (Wed Sep 19, 10:44 am)
Re: [PATCH 03/24] create cleanup helper svc_msnfs(), Dave Hansen, (Wed Sep 19, 10:45 am)
Re: [PATCH 03/24] create cleanup helper svc_msnfs(), Trond Myklebust, (Wed Sep 19, 10:54 am)
Re: [PATCH 03/24] create cleanup helper svc_msnfs(), Christoph Hellwig, (Wed Sep 19, 10:59 am)
Re: [PATCH 03/24] create cleanup helper svc_msnfs(), Trond Myklebust, (Wed Sep 19, 11:10 am)
Re: [PATCH 00/24] Read-only bind mounts, Andrew Morton, (Wed Sep 19, 2:24 pm)
Re: [PATCH 00/24] Read-only bind mounts, Dave Hansen, (Wed Sep 19, 2:56 pm)
Re: [PATCH 00/24] Read-only bind mounts, Andrew Morton, (Wed Sep 19, 3:06 pm)
Re: [PATCH 00/24] Read-only bind mounts, Miklos Szeredi, (Thu Sep 20, 2:58 am)
Re: [PATCH] docuement filesystem helpers for custom 'struc ..., Christoph Hellwig, (Thu Sep 20, 10:30 am)