diff options
| author | Deepa Dinamani <deepa.kernel@gmail.com> | 2016-09-14 10:48:05 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2016-09-27 21:06:22 -0400 |
| commit | 02027d42c3f747945f19111d3da2092ed2148ac8 (patch) | |
| tree | 1eac59f95ba905fb1d1fe5a53a792145e8e9c267 /fs | |
| parent | 078cd8279e659989b103359bb22373cc79445bde (diff) | |
fs: Replace CURRENT_TIME_SEC with current_time() for inode timestamps
CURRENT_TIME_SEC is not y2038 safe. current_time() will
be transitioned to use 64 bit time along with vfs in a
separate patch.
There is no plan to transistion CURRENT_TIME_SEC to use
y2038 safe time interfaces.
current_time() will also be extended to use superblock
range checking parameters when range checking is introduced.
This works because alloc_super() fills in the the s_time_gran
in super block to NSEC_PER_SEC.
Signed-off-by: Deepa Dinamani <deepa.kernel@gmail.com>
Acked-by: Jan Kara <jack@suse.cz>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
47 files changed, 105 insertions, 105 deletions
diff --git a/fs/affs/amigaffs.c b/fs/affs/amigaffs.c index d8f217c711d3..0ec65c133b93 100644 --- a/fs/affs/amigaffs.c +++ b/fs/affs/amigaffs.c | |||
| @@ -58,7 +58,7 @@ affs_insert_hash(struct inode *dir, struct buffer_head *bh) | |||
| 58 | mark_buffer_dirty_inode(dir_bh, dir); | 58 | mark_buffer_dirty_inode(dir_bh, dir); |
| 59 | affs_brelse(dir_bh); | 59 | affs_brelse(dir_bh); |
| 60 | 60 | ||
| 61 | dir->i_mtime = dir->i_ctime = CURRENT_TIME_SEC; | 61 | dir->i_mtime = dir->i_ctime = current_time(dir); |
| 62 | dir->i_version++; | 62 | dir->i_version++; |
| 63 | mark_inode_dirty(dir); | 63 | mark_inode_dirty(dir); |
| 64 | 64 | ||
| @@ -112,7 +112,7 @@ affs_remove_hash(struct inode *dir, struct buffer_head *rem_bh) | |||
| 112 | 112 | ||
| 113 | affs_brelse(bh); | 113 | affs_brelse(bh); |
| 114 | 114 | ||
| 115 | dir->i_mtime = dir->i_ctime = CURRENT_TIME_SEC; | 115 | dir->i_mtime = dir->i_ctime = current_time(dir); |
| 116 | dir->i_version++; | 116 | dir->i_version++; |
| 117 | mark_inode_dirty(dir); | 117 | mark_inode_dirty(dir); |
| 118 | 118 | ||
| @@ -313,7 +313,7 @@ affs_remove_header(struct dentry *dentry) | |||
| 313 | else | 313 | else |
| 314 | clear_nlink(inode); | 314 | clear_nlink(inode); |
| 315 | affs_unlock_link(inode); | 315 | affs_unlock_link(inode); |
| 316 | inode->i_ctime = CURRENT_TIME_SEC; | 316 | inode->i_ctime = current_time(inode); |
| 317 | mark_inode_dirty(inode); | 317 | mark_inode_dirty(inode); |
| 318 | 318 | ||
| 319 | done: | 319 | done: |
diff --git a/fs/affs/inode.c b/fs/affs/inode.c index 0fdb0f5b2239..ed120ec7542c 100644 --- a/fs/affs/inode.c +++ b/fs/affs/inode.c | |||
| @@ -309,7 +309,7 @@ affs_new_inode(struct inode *dir) | |||
| 309 | inode->i_gid = current_fsgid(); | 309 | inode->i_gid = current_fsgid(); |
| 310 | inode->i_ino = block; | 310 | inode->i_ino = block; |
| 311 | set_nlink(inode, 1); | 311 | set_nlink(inode, 1); |
| 312 | inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME_SEC; | 312 | inode->i_mtime = inode->i_atime = inode->i_ctime = current_time(inode); |
| 313 | atomic_set(&AFFS_I(inode)->i_opencnt, 0); | 313 | atomic_set(&AFFS_I(inode)->i_opencnt, 0); |
| 314 | AFFS_I(inode)->i_blkcnt = 0; | 314 | AFFS_I(inode)->i_blkcnt = 0; |
| 315 | AFFS_I(inode)->i_lc = NULL; | 315 | AFFS_I(inode)->i_lc = NULL; |
diff --git a/fs/bfs/dir.c b/fs/bfs/dir.c index 34a5bc2f1290..4206419a4bdf 100644 --- a/fs/bfs/dir.c +++ b/fs/bfs/dir.c | |||
| @@ -97,7 +97,7 @@ static int bfs_create(struct inode *dir, struct dentry *dentry, umode_t mode, | |||
| 97 | set_bit(ino, info->si_imap); | 97 | set_bit(ino, info->si_imap); |
| 98 | info->si_freei--; | 98 | info->si_freei--; |
| 99 | inode_init_owner(inode, dir, mode); | 99 | inode_init_owner(inode, dir, mode); |
| 100 | inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME_SEC; | 100 | inode->i_mtime = inode->i_atime = inode->i_ctime = current_time(inode); |
| 101 | inode->i_blocks = 0; | 101 | inode->i_blocks = 0; |
| 102 | inode->i_op = &bfs_file_inops; | 102 | inode->i_op = &bfs_file_inops; |
| 103 | inode->i_fop = &bfs_file_operations; | 103 | inode->i_fop = &bfs_file_operations; |
| @@ -165,7 +165,7 @@ static int bfs_link(struct dentry *old, struct inode *dir, | |||
| 165 | return err; | 165 | return err; |
| 166 | } | 166 | } |
| 167 | inc_nlink(inode); | 167 | inc_nlink(inode); |
| 168 | inode->i_ctime = CURRENT_TIME_SEC; | 168 | inode->i_ctime = current_time(inode); |
| 169 | mark_inode_dirty(inode); | 169 | mark_inode_dirty(inode); |
| 170 | ihold(inode); | 170 | ihold(inode); |
| 171 | d_instantiate(new, inode); | 171 | d_instantiate(new, inode); |
| @@ -194,7 +194,7 @@ static int bfs_unlink(struct inode *dir, struct dentry *dentry) | |||
| 194 | } | 194 | } |
| 195 | de->ino = 0; | 195 | de->ino = 0; |
| 196 | mark_buffer_dirty_inode(bh, dir); | 196 | mark_buffer_dirty_inode(bh, dir); |
| 197 | dir->i_ctime = dir->i_mtime = CURRENT_TIME_SEC; | 197 | dir->i_ctime = dir->i_mtime = current_time(dir); |
| 198 | mark_inode_dirty(dir); | 198 | mark_inode_dirty(dir); |
| 199 | inode->i_ctime = dir->i_ctime; | 199 | inode->i_ctime = dir->i_ctime; |
| 200 | inode_dec_link_count(inode); | 200 | inode_dec_link_count(inode); |
| @@ -249,10 +249,10 @@ static int bfs_rename(struct inode *old_dir, struct dentry *old_dentry, | |||
| 249 | goto end_rename; | 249 | goto end_rename; |
| 250 | } | 250 | } |
| 251 | old_de->ino = 0; | 251 | old_de->ino = 0; |
| 252 | old_dir->i_ctime = old_dir->i_mtime = CURRENT_TIME_SEC; | 252 | old_dir->i_ctime = old_dir->i_mtime = current_time(old_dir); |
| 253 | mark_inode_dirty(old_dir); | 253 | mark_inode_dirty(old_dir); |
| 254 | if (new_inode) { | 254 | if (new_inode) { |
| 255 | new_inode->i_ctime = CURRENT_TIME_SEC; | 255 | new_inode->i_ctime = current_time(new_inode); |
| 256 | inode_dec_link_count(new_inode); | 256 | inode_dec_link_count(new_inode); |
| 257 | } | 257 | } |
| 258 | mark_buffer_dirty_inode(old_bh, old_dir); | 258 | mark_buffer_dirty_inode(old_bh, old_dir); |
| @@ -300,9 +300,9 @@ static int bfs_add_entry(struct inode *dir, const unsigned char *name, | |||
| 300 | pos = (block - sblock) * BFS_BSIZE + off; | 300 | pos = (block - sblock) * BFS_BSIZE + off; |
| 301 | if (pos >= dir->i_size) { | 301 | if (pos >= dir->i_size) { |
| 302 | dir->i_size += BFS_DIRENT_SIZE; | 302 | dir->i_size += BFS_DIRENT_SIZE; |
| 303 | dir->i_ctime = CURRENT_TIME_SEC; | 303 | dir->i_ctime = current_time(dir); |
| 304 | } | 304 | } |
| 305 | dir->i_mtime = CURRENT_TIME_SEC; | 305 | dir->i_mtime = current_time(dir); |
| 306 | mark_inode_dirty(dir); | 306 | mark_inode_dirty(dir); |
| 307 | de->ino = cpu_to_le16((u16)ino); | 307 | de->ino = cpu_to_le16((u16)ino); |
| 308 | for (i = 0; i < BFS_NAMELEN; i++) | 308 | for (i = 0; i < BFS_NAMELEN; i++) |
diff --git a/fs/coda/dir.c b/fs/coda/dir.c index 6fb8672c0892..b10a74bac58b 100644 --- a/fs/coda/dir.c +++ b/fs/coda/dir.c | |||
| @@ -109,7 +109,7 @@ static inline void coda_dir_update_mtime(struct inode *dir) | |||
| 109 | /* optimistically we can also act as if our nose bleeds. The | 109 | /* optimistically we can also act as if our nose bleeds. The |
| 110 | * granularity of the mtime is coarse anyways so we might actually be | 110 | * granularity of the mtime is coarse anyways so we might actually be |
| 111 | * right most of the time. Note: we only do this for directories. */ | 111 | * right most of the time. Note: we only do this for directories. */ |
| 112 | dir->i_mtime = dir->i_ctime = CURRENT_TIME_SEC; | 112 | dir->i_mtime = dir->i_ctime = current_time(dir); |
| 113 | #endif | 113 | #endif |
| 114 | } | 114 | } |
| 115 | 115 | ||
diff --git a/fs/coda/file.c b/fs/coda/file.c index f47c7483863b..42be8a6f1105 100644 --- a/fs/coda/file.c +++ b/fs/coda/file.c | |||
| @@ -75,7 +75,7 @@ coda_file_write_iter(struct kiocb *iocb, struct iov_iter *to) | |||
| 75 | ret = vfs_iter_write(cfi->cfi_container, to, &iocb->ki_pos); | 75 | ret = vfs_iter_write(cfi->cfi_container, to, &iocb->ki_pos); |
| 76 | coda_inode->i_size = file_inode(host_file)->i_size; | 76 | coda_inode->i_size = file_inode(host_file)->i_size; |
| 77 | coda_inode->i_blocks = (coda_inode->i_size + 511) >> 9; | 77 | coda_inode->i_blocks = (coda_inode->i_size + 511) >> 9; |
