Commit 607a11ad authored by Deepa Dinamani's avatar Deepa Dinamani Committed by Linus Torvalds
Browse files

fs: ubifs: replace CURRENT_TIME_SEC with current_time 

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 transition CURRENT_TIME_SEC to use y2038 safe time interfaces.

current_time() returns timestamps according to the granularities set in
the inode's super_block.  The granularity check to call
current_fs_time() or CURRENT_TIME_SEC is not required.

Use current_time() directly to update inode timestamp.  Use
timespec_trunc during file system creation, before the first inode is
created.

Link: http://lkml.kernel.org/r/1491613030-11599-9-git-send-email-deepa.kernel@gmail.com


Signed-off-by: default avatarDeepa Dinamani <deepa.kernel@gmail.com>
Reviewed-by: default avatarArnd Bergmann <arnd@arndb.de>
Cc: Richard Weinberger <richard@nod.at>
Cc: Artem Bityutskiy <dedekind1@gmail.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a88e99e9

fs/ubifs/dir.c

+6 −6
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ struct inode *ubifs_new_inode(struct ubifs_info *c, struct inode *dir, 


	inode_init_owner(inode, dir, mode);

	inode->i_mtime = inode->i_atime = inode->i_ctime =

			 ubifs_current_time(inode);

			 current_time(inode);

	inode->i_mapping->nrpages = 0;



	switch (mode & S_IFMT) {
@@ -755,7 +755,7 @@ static int ubifs_link(struct dentry *old_dentry, struct inode *dir, 


	inc_nlink(inode);

	ihold(inode);

	inode->i_ctime = ubifs_current_time(inode);

	inode->i_ctime = current_time(inode);

	dir->i_size += sz_change;

	dir_ui->ui_size = dir->i_size;

	dir->i_mtime = dir->i_ctime = inode->i_ctime;
@@ -830,7 +830,7 @@ static int ubifs_unlink(struct inode *dir, struct dentry *dentry) 
	}



	lock_2_inodes(dir, inode);

	inode->i_ctime = ubifs_current_time(dir);

	inode->i_ctime = current_time(dir);

	drop_nlink(inode);

	dir->i_size -= sz_change;

	dir_ui->ui_size = dir->i_size;
@@ -934,7 +934,7 @@ static int ubifs_rmdir(struct inode *dir, struct dentry *dentry) 
	}



	lock_2_inodes(dir, inode);

	inode->i_ctime = ubifs_current_time(dir);

	inode->i_ctime = current_time(dir);

	clear_nlink(inode);

	drop_nlink(dir);

	dir->i_size -= sz_change;
@@ -1411,7 +1411,7 @@ static int do_rename(struct inode *old_dir, struct dentry *old_dentry, 
	 * Like most other Unix systems, set the @i_ctime for inodes on a

	 * rename.

	 */

	time = ubifs_current_time(old_dir);

	time = current_time(old_dir);

	old_inode->i_ctime = time;



	/* We must adjust parent link count when renaming directories */
@@ -1584,7 +1584,7 @@ static int ubifs_xrename(struct inode *old_dir, struct dentry *old_dentry, 


	lock_4_inodes(old_dir, new_dir, NULL, NULL);



	time = ubifs_current_time(old_dir);

	time = current_time(old_dir);

	fst_inode->i_ctime = time;

	snd_inode->i_ctime = time;

	old_dir->i_mtime = old_dir->i_ctime = time;

fs/ubifs/file.c

+6 −6
Original line number Diff line number Diff line
@@ -1196,7 +1196,7 @@ static int do_truncation(struct ubifs_info *c, struct inode *inode, 
	mutex_lock(&ui->ui_mutex);

	ui->ui_size = inode->i_size;

	/* Truncation changes inode [mc]time */

	inode->i_mtime = inode->i_ctime = ubifs_current_time(inode);

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

	/* Other attributes may be changed at the same time as well */

	do_attr_changes(inode, attr);

	err = ubifs_jnl_truncate(c, inode, old_size, new_size);
@@ -1243,7 +1243,7 @@ static int do_setattr(struct ubifs_info *c, struct inode *inode, 
	mutex_lock(&ui->ui_mutex);

	if (attr->ia_valid & ATTR_SIZE) {

		/* Truncation changes inode [mc]time */

		inode->i_mtime = inode->i_ctime = ubifs_current_time(inode);

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

		/* 'truncate_setsize()' changed @i_size, update @ui_size */

		ui->ui_size = inode->i_size;

	}
@@ -1420,7 +1420,7 @@ int ubifs_update_time(struct inode *inode, struct timespec *time, 
 */

static int update_mctime(struct inode *inode)

{

	struct timespec now = ubifs_current_time(inode);

	struct timespec now = current_time(inode);

	struct ubifs_inode *ui = ubifs_inode(inode);

	struct ubifs_info *c = inode->i_sb->s_fs_info;
@@ -1434,7 +1434,7 @@ static int update_mctime(struct inode *inode) 
			return err;



		mutex_lock(&ui->ui_mutex);

		inode->i_mtime = inode->i_ctime = ubifs_current_time(inode);

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

		release = ui->dirty;

		mark_inode_dirty_sync(inode);

		mutex_unlock(&ui->ui_mutex);
@@ -1511,7 +1511,7 @@ static int ubifs_vm_page_mkwrite(struct vm_fault *vmf) 
	struct page *page = vmf->page;

	struct inode *inode = file_inode(vmf->vma->vm_file);

	struct ubifs_info *c = inode->i_sb->s_fs_info;

	struct timespec now = ubifs_current_time(inode);

	struct timespec now = current_time(inode);

	struct ubifs_budget_req req = { .new_page = 1 };

	int err, update_time;
@@ -1579,7 +1579,7 @@ static int ubifs_vm_page_mkwrite(struct vm_fault *vmf) 
		struct ubifs_inode *ui = ubifs_inode(inode);



		mutex_lock(&ui->ui_mutex);

		inode->i_mtime = inode->i_ctime = ubifs_current_time(inode);

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

		release = ui->dirty;

		mark_inode_dirty_sync(inode);

		mutex_unlock(&ui->ui_mutex);

fs/ubifs/ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ static int setflags(struct inode *inode, int flags) 


	ui->flags = ioctl2ubifs(flags);

	ubifs_set_inode_flags(inode);

	inode->i_ctime = ubifs_current_time(inode);

	inode->i_ctime = current_time(inode);

	release = ui->dirty;

	mark_inode_dirty_sync(inode);

	mutex_unlock(&ui->ui_mutex);

fs/ubifs/misc.h

+0 −10
Original line number Diff line number Diff line
@@ -224,16 +224,6 @@ static inline void *ubifs_idx_key(const struct ubifs_info *c, 
	return (void *)((struct ubifs_branch *)idx->branches)->key;

}



/**

 * ubifs_current_time - round current time to time granularity.

 * @inode: inode

 */

static inline struct timespec ubifs_current_time(struct inode *inode)

{

	return (inode->i_sb->s_time_gran < NSEC_PER_SEC) ?

		current_fs_time(inode->i_sb) : CURRENT_TIME_SEC;

}



/**

 * ubifs_tnc_lookup - look up a file-system node.

 * @c: UBIFS file-system description object

fs/ubifs/sb.c

+10 −4
Original line number Diff line number Diff line
@@ -84,6 +84,8 @@ static int create_default_filesystem(struct ubifs_info *c) 
	int min_leb_cnt = UBIFS_MIN_LEB_CNT;

	long long tmp64, main_bytes;

	__le64 tmp_le64;

	__le32 tmp_le32;

	struct timespec ts;



	/* Some functions called from here depend on the @c->key_len filed */

	c->key_len = UBIFS_SK_LEN;
@@ -298,13 +300,17 @@ static int create_default_filesystem(struct ubifs_info *c) 
	ino->ch.node_type = UBIFS_INO_NODE;

	ino->creat_sqnum = cpu_to_le64(++c->max_sqnum);

	ino->nlink = cpu_to_le32(2);

	tmp_le64 = cpu_to_le64(CURRENT_TIME_SEC.tv_sec);



	ktime_get_real_ts(&ts);

	ts = timespec_trunc(ts, DEFAULT_TIME_GRAN);

	tmp_le64 = cpu_to_le64(ts.tv_sec);

	ino->atime_sec   = tmp_le64;

	ino->ctime_sec   = tmp_le64;

	ino->mtime_sec   = tmp_le64;

	ino->atime_nsec  = 0;

	ino->ctime_nsec  = 0;

	ino->mtime_nsec  = 0;

	tmp_le32 = cpu_to_le32(ts.tv_nsec);

	ino->atime_nsec  = tmp_le32;

	ino->ctime_nsec  = tmp_le32;

	ino->mtime_nsec  = tmp_le32;

	ino->mode = cpu_to_le32(S_IFDIR | S_IRUGO | S_IWUSR | S_IXUGO);

	ino->size = cpu_to_le64(UBIFS_INO_NODE_SZ);

CRA Git | Maintained and supported by SUSTech CRA and CCSE