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

Commit 02027d42 authored by Deepa Dinamani's avatar Deepa Dinamani Committed by Al Viro
Browse files

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: default avatarDeepa Dinamani <deepa.kernel@gmail.com>
Acked-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 078cd827

fs/affs/amigaffs.c

+3 −3
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ affs_insert_hash(struct inode *dir, struct buffer_head *bh) 
	mark_buffer_dirty_inode(dir_bh, dir);

	affs_brelse(dir_bh);



	dir->i_mtime = dir->i_ctime = CURRENT_TIME_SEC;

	dir->i_mtime = dir->i_ctime = current_time(dir);

	dir->i_version++;

	mark_inode_dirty(dir);
@@ -112,7 +112,7 @@ affs_remove_hash(struct inode *dir, struct buffer_head *rem_bh) 


	affs_brelse(bh);



	dir->i_mtime = dir->i_ctime = CURRENT_TIME_SEC;

	dir->i_mtime = dir->i_ctime = current_time(dir);

	dir->i_version++;

	mark_inode_dirty(dir);
@@ -313,7 +313,7 @@ affs_remove_header(struct dentry *dentry) 
	else

		clear_nlink(inode);

	affs_unlock_link(inode);

	inode->i_ctime = CURRENT_TIME_SEC;

	inode->i_ctime = current_time(inode);

	mark_inode_dirty(inode);



done:

fs/affs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -309,7 +309,7 @@ affs_new_inode(struct inode *dir) 
	inode->i_gid     = current_fsgid();

	inode->i_ino     = block;

	set_nlink(inode, 1);

	inode->i_mtime   = inode->i_atime = inode->i_ctime = CURRENT_TIME_SEC;

	inode->i_mtime   = inode->i_atime = inode->i_ctime = current_time(inode);

	atomic_set(&AFFS_I(inode)->i_opencnt, 0);

	AFFS_I(inode)->i_blkcnt = 0;

	AFFS_I(inode)->i_lc = NULL;

fs/bfs/dir.c

+7 −7
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ static int bfs_create(struct inode *dir, struct dentry *dentry, umode_t mode, 
	set_bit(ino, info->si_imap);

	info->si_freei--;

	inode_init_owner(inode, dir, mode);

	inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME_SEC;

	inode->i_mtime = inode->i_atime = inode->i_ctime = current_time(inode);

	inode->i_blocks = 0;

	inode->i_op = &bfs_file_inops;

	inode->i_fop = &bfs_file_operations;
@@ -165,7 +165,7 @@ static int bfs_link(struct dentry *old, struct inode *dir, 
		return err;

	}

	inc_nlink(inode);

	inode->i_ctime = CURRENT_TIME_SEC;

	inode->i_ctime = current_time(inode);

	mark_inode_dirty(inode);

	ihold(inode);

	d_instantiate(new, inode);
@@ -194,7 +194,7 @@ static int bfs_unlink(struct inode *dir, struct dentry *dentry) 
	}

	de->ino = 0;

	mark_buffer_dirty_inode(bh, dir);

	dir->i_ctime = dir->i_mtime = CURRENT_TIME_SEC;

	dir->i_ctime = dir->i_mtime = current_time(dir);

	mark_inode_dirty(dir);

	inode->i_ctime = dir->i_ctime;

	inode_dec_link_count(inode);
@@ -249,10 +249,10 @@ static int bfs_rename(struct inode *old_dir, struct dentry *old_dentry, 
			goto end_rename;

	}

	old_de->ino = 0;

	old_dir->i_ctime = old_dir->i_mtime = CURRENT_TIME_SEC;

	old_dir->i_ctime = old_dir->i_mtime = current_time(old_dir);

	mark_inode_dirty(old_dir);

	if (new_inode) {

		new_inode->i_ctime = CURRENT_TIME_SEC;

		new_inode->i_ctime = current_time(new_inode);

		inode_dec_link_count(new_inode);

	}

	mark_buffer_dirty_inode(old_bh, old_dir);
@@ -300,9 +300,9 @@ static int bfs_add_entry(struct inode *dir, const unsigned char *name, 
				pos = (block - sblock) * BFS_BSIZE + off;

				if (pos >= dir->i_size) {

					dir->i_size += BFS_DIRENT_SIZE;

					dir->i_ctime = CURRENT_TIME_SEC;

					dir->i_ctime = current_time(dir);

				}

				dir->i_mtime = CURRENT_TIME_SEC;

				dir->i_mtime = current_time(dir);

				mark_inode_dirty(dir);

				de->ino = cpu_to_le16((u16)ino);

				for (i = 0; i < BFS_NAMELEN; i++)

fs/coda/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ static inline void coda_dir_update_mtime(struct inode *dir) 
	/* optimistically we can also act as if our nose bleeds. The

	 * granularity of the mtime is coarse anyways so we might actually be

	 * right most of the time. Note: we only do this for directories. */

	dir->i_mtime = dir->i_ctime = CURRENT_TIME_SEC;

	dir->i_mtime = dir->i_ctime = current_time(dir);

#endif

}

fs/coda/file.c

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ coda_file_write_iter(struct kiocb *iocb, struct iov_iter *to) 
	ret = vfs_iter_write(cfi->cfi_container, to, &iocb->ki_pos);

	coda_inode->i_size = file_inode(host_file)->i_size;

	coda_inode->i_blocks = (coda_inode->i_size + 511) >> 9;

	coda_inode->i_mtime = coda_inode->i_ctime = CURRENT_TIME_SEC;

	coda_inode->i_mtime = coda_inode->i_ctime = current_time(coda_inode);

	inode_unlock(coda_inode);

	file_end_write(host_file);

	return ret;