Commit 5a86174c authored by Cesar Eduardo Barros's avatar Cesar Eduardo Barros Committed by Linus Torvalds

[PATCH] O_NOATIME support

This patch adds support for the O_NOATIME open flag (GNU extension):

int O_NOATIME  	Macro
  If this bit is set, read will not update the access time of the file.
  See File Times. This is used by programs that do backups, so that
  backing a file up does not count as reading it. Only the owner of the
  file or the superuser may use this bit.

It is useful if you want to do something with the file atime (for instance,
moving files that have not been accessed in a while to somewhere else, or
something like Debian's popularity-contest) but you also want to read all
files periodically (for instance, tripwire or debsums).

Currently, the program that reads all files periodically has to use utimes,
which can race with the atime update:

    A               B
  open
  fstat
  read
                  open
                  read
                  close
  close
  utimes

And the file still has the old atime, instead of the new one from when B
did the read from it.  This problem does not happen if A uses O_NOATIME
instead of utimes to preserve the atime.

This patch adds the O_NOATIME constant for all architectures, but it would
also be possible to add it one architecture at a time by defining it to 0
when not defined in asm-*.

Based on patch by Marek Michalkiewicz <marekm@i17linuxb.ists.pwr.wroc.pl> at
http://www.uwsg.iu.edu/hypermail/linux/kernel/9811.2/0118.htmlSigned-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 17e14bef
...@@ -212,7 +212,7 @@ asmlinkage long sys_dup(unsigned int fildes) ...@@ -212,7 +212,7 @@ asmlinkage long sys_dup(unsigned int fildes)
return ret; return ret;
} }
#define SETFL_MASK (O_APPEND | O_NONBLOCK | O_NDELAY | FASYNC | O_DIRECT) #define SETFL_MASK (O_APPEND | O_NONBLOCK | O_NDELAY | FASYNC | O_DIRECT | O_NOATIME)
static int setfl(int fd, struct file * filp, unsigned long arg) static int setfl(int fd, struct file * filp, unsigned long arg)
{ {
...@@ -223,6 +223,11 @@ static int setfl(int fd, struct file * filp, unsigned long arg) ...@@ -223,6 +223,11 @@ static int setfl(int fd, struct file * filp, unsigned long arg)
if (!(arg & O_APPEND) && IS_APPEND(inode)) if (!(arg & O_APPEND) && IS_APPEND(inode))
return -EPERM; return -EPERM;
/* O_NOATIME can only be set by the owner or superuser */
if ((arg & O_NOATIME) && !(filp->f_flags & O_NOATIME))
if (current->fsuid != inode->i_uid && !capable(CAP_FOWNER))
return -EPERM;
/* required for strict SunOS emulation */ /* required for strict SunOS emulation */
if (O_NONBLOCK != O_NDELAY) if (O_NONBLOCK != O_NDELAY)
if (arg & O_NDELAY) if (arg & O_NDELAY)
......
...@@ -1206,6 +1206,11 @@ int may_open(struct nameidata *nd, int acc_mode, int flag) ...@@ -1206,6 +1206,11 @@ int may_open(struct nameidata *nd, int acc_mode, int flag)
return -EPERM; return -EPERM;
} }
/* O_NOATIME can only be set by the owner or superuser */
if (flag & O_NOATIME)
if (current->fsuid != inode->i_uid && !capable(CAP_FOWNER))
return -EPERM;
/* /*
* Ensure there are no outstanding leases on the file. * Ensure there are no outstanding leases on the file.
*/ */
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#define O_NOFOLLOW 0200000 /* don't follow links */ #define O_NOFOLLOW 0200000 /* don't follow links */
#define O_LARGEFILE 0400000 /* will be set by the kernel on every open */ #define O_LARGEFILE 0400000 /* will be set by the kernel on every open */
#define O_DIRECT 02000000 /* direct disk access - should check with OSF/1 */ #define O_DIRECT 02000000 /* direct disk access - should check with OSF/1 */
#define O_NOATIME 04000000
#define F_DUPFD 0 /* dup */ #define F_DUPFD 0 /* dup */
#define F_GETFD 1 /* get close_on_exec */ #define F_GETFD 1 /* get close_on_exec */
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#define O_NOFOLLOW 0100000 /* don't follow links */ #define O_NOFOLLOW 0100000 /* don't follow links */
#define O_DIRECT 0200000 /* direct disk access hint - currently ignored */ #define O_DIRECT 0200000 /* direct disk access hint - currently ignored */
#define O_LARGEFILE 0400000 #define O_LARGEFILE 0400000
#define O_NOATIME 01000000
#define F_DUPFD 0 /* dup */ #define F_DUPFD 0 /* dup */
#define F_GETFD 1 /* get close_on_exec */ #define F_GETFD 1 /* get close_on_exec */
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#define O_NOFOLLOW 0100000 /* don't follow links */ #define O_NOFOLLOW 0100000 /* don't follow links */
#define O_DIRECT 0200000 /* direct disk access hint - currently ignored */ #define O_DIRECT 0200000 /* direct disk access hint - currently ignored */
#define O_LARGEFILE 0400000 #define O_LARGEFILE 0400000
#define O_NOATIME 01000000
#define F_DUPFD 0 /* dup */ #define F_DUPFD 0 /* dup */
#define F_GETFD 1 /* get close_on_exec */ #define F_GETFD 1 /* get close_on_exec */
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#define O_LARGEFILE 0100000 #define O_LARGEFILE 0100000
#define O_DIRECTORY 0200000 /* must be a directory */ #define O_DIRECTORY 0200000 /* must be a directory */
#define O_NOFOLLOW 0400000 /* don't follow links */ #define O_NOFOLLOW 0400000 /* don't follow links */
#define O_NOATIME 01000000
#define F_DUPFD 0 /* dup */ #define F_DUPFD 0 /* dup */
#define F_GETFD 1 /* get f_flags */ #define F_GETFD 1 /* get f_flags */
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#define O_NOFOLLOW 0100000 /* don't follow links */ #define O_NOFOLLOW 0100000 /* don't follow links */
#define O_DIRECT 0200000 /* direct disk access hint - currently ignored */ #define O_DIRECT 0200000 /* direct disk access hint - currently ignored */
#define O_LARGEFILE 0400000 #define O_LARGEFILE 0400000
#define O_NOATIME 01000000
#define F_DUPFD 0 /* dup */ #define F_DUPFD 0 /* dup */
#define F_GETFD 1 /* get close_on_exec */ #define F_GETFD 1 /* get close_on_exec */
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#define O_LARGEFILE 0100000 #define O_LARGEFILE 0100000
#define O_DIRECTORY 0200000 /* must be a directory */ #define O_DIRECTORY 0200000 /* must be a directory */
#define O_NOFOLLOW 0400000 /* don't follow links */ #define O_NOFOLLOW 0400000 /* don't follow links */
#define O_NOATIME 01000000
#define F_DUPFD 0 /* dup */ #define F_DUPFD 0 /* dup */
#define F_GETFD 1 /* get close_on_exec */ #define F_GETFD 1 /* get close_on_exec */
......
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
#define O_LARGEFILE 0100000 #define O_LARGEFILE 0100000
#define O_DIRECTORY 0200000 /* must be a directory */ #define O_DIRECTORY 0200000 /* must be a directory */
#define O_NOFOLLOW 0400000 /* don't follow links */ #define O_NOFOLLOW 0400000 /* don't follow links */
#define O_NOATIME 01000000
#define F_DUPFD 0 /* dup */ #define F_DUPFD 0 /* dup */
#define F_GETFD 1 /* get close_on_exec */ #define F_GETFD 1 /* get close_on_exec */
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#define O_NOFOLLOW 0100000 /* don't follow links */ #define O_NOFOLLOW 0100000 /* don't follow links */
#define O_DIRECT 0200000 /* direct disk access hint - currently ignored */ #define O_DIRECT 0200000 /* direct disk access hint - currently ignored */
#define O_LARGEFILE 0400000 #define O_LARGEFILE 0400000
#define O_NOATIME 01000000
#define F_DUPFD 0 /* dup */ #define F_DUPFD 0 /* dup */
#define F_GETFD 1 /* get close_on_exec */ #define F_GETFD 1 /* get close_on_exec */
......
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
#define O_DIRECT 0x8000 /* direct disk access hint */ #define O_DIRECT 0x8000 /* direct disk access hint */
#define O_DIRECTORY 0x10000 /* must be a directory */ #define O_DIRECTORY 0x10000 /* must be a directory */
#define O_NOFOLLOW 0x20000 /* don't follow links */ #define O_NOFOLLOW 0x20000 /* don't follow links */
#define O_NOATIME 0x40000
#define O_NDELAY O_NONBLOCK #define O_NDELAY O_NONBLOCK
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
#define O_NOCTTY 00400000 /* not fcntl */ #define O_NOCTTY 00400000 /* not fcntl */
#define O_DSYNC 01000000 /* HPUX only */ #define O_DSYNC 01000000 /* HPUX only */
#define O_RSYNC 02000000 /* HPUX only */ #define O_RSYNC 02000000 /* HPUX only */
#define O_NOATIME 04000000
#define FASYNC 00020000 /* fcntl, for BSD compatibility */ #define FASYNC 00020000 /* fcntl, for BSD compatibility */
#define O_DIRECT 00040000 /* direct disk access hint - currently ignored */ #define O_DIRECT 00040000 /* direct disk access hint - currently ignored */
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#define O_NOFOLLOW 0100000 /* don't follow links */ #define O_NOFOLLOW 0100000 /* don't follow links */
#define O_LARGEFILE 0200000 #define O_LARGEFILE 0200000
#define O_DIRECT 0400000 /* direct disk access hint */ #define O_DIRECT 0400000 /* direct disk access hint */
#define O_NOATIME 01000000
#define F_DUPFD 0 /* dup */ #define F_DUPFD 0 /* dup */
#define F_GETFD 1 /* get close_on_exec */ #define F_GETFD 1 /* get close_on_exec */
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#define O_NOFOLLOW 0100000 /* don't follow links */ #define O_NOFOLLOW 0100000 /* don't follow links */
#define O_LARGEFILE 0200000 #define O_LARGEFILE 0200000
#define O_DIRECT 0400000 /* direct disk access hint */ #define O_DIRECT 0400000 /* direct disk access hint */
#define O_NOATIME 01000000
#define F_DUPFD 0 /* dup */ #define F_DUPFD 0 /* dup */
#define F_GETFD 1 /* get close_on_exec */ #define F_GETFD 1 /* get close_on_exec */
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#define O_LARGEFILE 0100000 #define O_LARGEFILE 0100000
#define O_DIRECTORY 0200000 /* must be a directory */ #define O_DIRECTORY 0200000 /* must be a directory */
#define O_NOFOLLOW 0400000 /* don't follow links */ #define O_NOFOLLOW 0400000 /* don't follow links */
#define O_NOATIME 01000000
#define F_DUPFD 0 /* dup */ #define F_DUPFD 0 /* dup */
#define F_GETFD 1 /* get close_on_exec */ #define F_GETFD 1 /* get close_on_exec */
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#define O_LARGEFILE 0100000 #define O_LARGEFILE 0100000
#define O_DIRECTORY 0200000 /* must be a directory */ #define O_DIRECTORY 0200000 /* must be a directory */
#define O_NOFOLLOW 0400000 /* don't follow links */ #define O_NOFOLLOW 0400000 /* don't follow links */
#define O_NOATIME 01000000
#define F_DUPFD 0 /* dup */ #define F_DUPFD 0 /* dup */
#define F_GETFD 1 /* get close_on_exec */ #define F_GETFD 1 /* get close_on_exec */
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#define O_NOFOLLOW 0x20000 /* don't follow links */ #define O_NOFOLLOW 0x20000 /* don't follow links */
#define O_LARGEFILE 0x40000 #define O_LARGEFILE 0x40000
#define O_DIRECT 0x100000 /* direct disk access hint */ #define O_DIRECT 0x100000 /* direct disk access hint */
#define O_NOATIME 0x200000
#define F_DUPFD 0 /* dup */ #define F_DUPFD 0 /* dup */
#define F_GETFD 1 /* get close_on_exec */ #define F_GETFD 1 /* get close_on_exec */
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#define O_NOFOLLOW 0x20000 /* don't follow links */ #define O_NOFOLLOW 0x20000 /* don't follow links */
#define O_LARGEFILE 0x40000 #define O_LARGEFILE 0x40000
#define O_DIRECT 0x100000 /* direct disk access hint */ #define O_DIRECT 0x100000 /* direct disk access hint */
#define O_NOATIME 0x200000
#define F_DUPFD 0 /* dup */ #define F_DUPFD 0 /* dup */
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#define O_NOFOLLOW 0100000 /* don't follow links */ #define O_NOFOLLOW 0100000 /* don't follow links */
#define O_DIRECT 0200000 /* direct disk access hint - currently ignored */ #define O_DIRECT 0200000 /* direct disk access hint - currently ignored */
#define O_LARGEFILE 0400000 #define O_LARGEFILE 0400000
#define O_NOATIME 01000000
#define F_DUPFD 0 /* dup */ #define F_DUPFD 0 /* dup */
#define F_GETFD 1 /* get close_on_exec */ #define F_GETFD 1 /* get close_on_exec */
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#define O_LARGEFILE 0100000 #define O_LARGEFILE 0100000
#define O_DIRECTORY 0200000 /* must be a directory */ #define O_DIRECTORY 0200000 /* must be a directory */
#define O_NOFOLLOW 0400000 /* don't follow links */ #define O_NOFOLLOW 0400000 /* don't follow links */
#define O_NOATIME 01000000
#define F_DUPFD 0 /* dup */ #define F_DUPFD 0 /* dup */
#define F_GETFD 1 /* get close_on_exec */ #define F_GETFD 1 /* get close_on_exec */
......
...@@ -979,7 +979,8 @@ static inline void touch_atime(struct vfsmount *mnt, struct dentry *dentry) ...@@ -979,7 +979,8 @@ static inline void touch_atime(struct vfsmount *mnt, struct dentry *dentry)
static inline void file_accessed(struct file *file) static inline void file_accessed(struct file *file)
{ {
touch_atime(file->f_vfsmnt, file->f_dentry); if (!(file->f_flags & O_NOATIME))
touch_atime(file->f_vfsmnt, file->f_dentry);
} }
int sync_inode(struct inode *inode, struct writeback_control *wbc); int sync_inode(struct inode *inode, struct writeback_control *wbc);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment