diff options
Diffstat (limited to 'include/linux/fs.h')
-rw-r--r-- | include/linux/fs.h | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index 92ae3e2067b0..d1e370d25f7b 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h | |||
@@ -114,8 +114,7 @@ extern int dir_notify_enable; | |||
114 | /* | 114 | /* |
115 | * Superblock flags that can be altered by MS_REMOUNT | 115 | * Superblock flags that can be altered by MS_REMOUNT |
116 | */ | 116 | */ |
117 | #define MS_RMT_MASK (MS_RDONLY|MS_SYNCHRONOUS|MS_MANDLOCK|MS_NOATIME|\ | 117 | #define MS_RMT_MASK (MS_RDONLY|MS_SYNCHRONOUS|MS_MANDLOCK) |
118 | MS_NODIRATIME) | ||
119 | 118 | ||
120 | /* | 119 | /* |
121 | * Old magic mount flag and mask | 120 | * Old magic mount flag and mask |
@@ -161,8 +160,6 @@ extern int dir_notify_enable; | |||
161 | #define IS_NOQUOTA(inode) ((inode)->i_flags & S_NOQUOTA) | 160 | #define IS_NOQUOTA(inode) ((inode)->i_flags & S_NOQUOTA) |
162 | #define IS_APPEND(inode) ((inode)->i_flags & S_APPEND) | 161 | #define IS_APPEND(inode) ((inode)->i_flags & S_APPEND) |
163 | #define IS_IMMUTABLE(inode) ((inode)->i_flags & S_IMMUTABLE) | 162 | #define IS_IMMUTABLE(inode) ((inode)->i_flags & S_IMMUTABLE) |
164 | #define IS_NOATIME(inode) (__IS_FLG(inode, MS_NOATIME) || ((inode)->i_flags & S_NOATIME)) | ||
165 | #define IS_NODIRATIME(inode) __IS_FLG(inode, MS_NODIRATIME) | ||
166 | #define IS_POSIXACL(inode) __IS_FLG(inode, MS_POSIXACL) | 163 | #define IS_POSIXACL(inode) __IS_FLG(inode, MS_POSIXACL) |
167 | 164 | ||
168 | #define IS_DEADDIR(inode) ((inode)->i_flags & S_DEAD) | 165 | #define IS_DEADDIR(inode) ((inode)->i_flags & S_DEAD) |
@@ -235,9 +232,6 @@ struct kstatfs; | |||
235 | struct vm_area_struct; | 232 | struct vm_area_struct; |
236 | struct vfsmount; | 233 | struct vfsmount; |
237 | 234 | ||
238 | /* Used to be a macro which just called the function, now just a function */ | ||
239 | extern void update_atime (struct inode *); | ||
240 | |||
241 | extern void __init inode_init(unsigned long); | 235 | extern void __init inode_init(unsigned long); |
242 | extern void __init inode_init_early(void); | 236 | extern void __init inode_init_early(void); |
243 | extern void __init mnt_init(unsigned long); | 237 | extern void __init mnt_init(unsigned long); |
@@ -1118,12 +1112,7 @@ static inline void mark_inode_dirty_sync(struct inode *inode) | |||
1118 | __mark_inode_dirty(inode, I_DIRTY_SYNC); | 1112 | __mark_inode_dirty(inode, I_DIRTY_SYNC); |
1119 | } | 1113 | } |
1120 | 1114 | ||
1121 | static inline void touch_atime(struct vfsmount *mnt, struct dentry *dentry) | 1115 | extern void touch_atime(struct vfsmount *mnt, struct dentry *dentry); |
1122 | { | ||
1123 | /* per-mountpoint checks will go here */ | ||
1124 | update_atime(dentry->d_inode); | ||
1125 | } | ||
1126 | |||
1127 | static inline void file_accessed(struct file *file) | 1116 | static inline void file_accessed(struct file *file) |
1128 | { | 1117 | { |
1129 | if (!(file->f_flags & O_NOATIME)) | 1118 | if (!(file->f_flags & O_NOATIME)) |
@@ -1716,7 +1705,7 @@ extern ssize_t simple_read_from_buffer(void __user *, size_t, loff_t *, const vo | |||
1716 | extern int inode_change_ok(struct inode *, struct iattr *); | 1705 | extern int inode_change_ok(struct inode *, struct iattr *); |
1717 | extern int __must_check inode_setattr(struct inode *, struct iattr *); | 1706 | extern int __must_check inode_setattr(struct inode *, struct iattr *); |
1718 | 1707 | ||
1719 | extern void inode_update_time(struct inode *inode, int ctime_too); | 1708 | extern void file_update_time(struct file *file); |
1720 | 1709 | ||
1721 | static inline ino_t parent_ino(struct dentry *dentry) | 1710 | static inline ino_t parent_ino(struct dentry *dentry) |
1722 | { | 1711 | { |