mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
fs: Replace CURRENT_TIME with current_time() for inode timestamps
CURRENT_TIME macro is not appropriate for filesystems as it doesn't use the right granularity for filesystem timestamps. Use current_time() instead. CURRENT_TIME is also not y2038 safe. This is also in preparation for the patch that transitions vfs timestamps to use 64 bit time and hence make them y2038 safe. As part of the effort current_time() will be extended to do range checks. Hence, it is necessary for all file system timestamps to use current_time(). Also, current_time() will be transitioned along with vfs to be y2038 safe. Note that whenever a single call to current_time() is used to change timestamps in different inodes, it is because they share the same time granularity. Signed-off-by: Deepa Dinamani <[email protected]> Reviewed-by: Arnd Bergmann <[email protected]> Acked-by: Felipe Balbi <[email protected]> Acked-by: Steven Whitehouse <[email protected]> Acked-by: Ryusuke Konishi <[email protected]> Acked-by: David Sterba <[email protected]> Signed-off-by: Al Viro <[email protected]>
This commit is contained in:
parent
2554c72edb
commit
078cd8279e
76 changed files with 182 additions and 182 deletions
|
|
@ -81,7 +81,7 @@ static int __jfs_set_acl(tid_t tid, struct inode *inode, int type,
|
|||
rc = posix_acl_equiv_mode(acl, &inode->i_mode);
|
||||
if (rc < 0)
|
||||
return rc;
|
||||
inode->i_ctime = CURRENT_TIME;
|
||||
inode->i_ctime = current_time(inode);
|
||||
mark_inode_dirty(inode);
|
||||
if (rc == 0)
|
||||
acl = NULL;
|
||||
|
|
|
|||
|
|
@ -403,7 +403,7 @@ void jfs_truncate_nolock(struct inode *ip, loff_t length)
|
|||
break;
|
||||
}
|
||||
|
||||
ip->i_mtime = ip->i_ctime = CURRENT_TIME;
|
||||
ip->i_mtime = ip->i_ctime = current_time(ip);
|
||||
mark_inode_dirty(ip);
|
||||
|
||||
txCommit(tid, 1, &ip, 0);
|
||||
|
|
|
|||
|
|
@ -131,7 +131,7 @@ struct inode *ialloc(struct inode *parent, umode_t mode)
|
|||
jfs_inode->mode2 |= inode->i_mode;
|
||||
|
||||
inode->i_blocks = 0;
|
||||
inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
|
||||
inode->i_mtime = inode->i_atime = inode->i_ctime = current_time(inode);
|
||||
jfs_inode->otime = inode->i_ctime.tv_sec;
|
||||
inode->i_generation = JFS_SBI(sb)->gengen++;
|
||||
|
||||
|
|
|
|||
|
|
@ -162,7 +162,7 @@ static int jfs_create(struct inode *dip, struct dentry *dentry, umode_t mode,
|
|||
|
||||
mark_inode_dirty(ip);
|
||||
|
||||
dip->i_ctime = dip->i_mtime = CURRENT_TIME;
|
||||
dip->i_ctime = dip->i_mtime = current_time(dip);
|
||||
|
||||
mark_inode_dirty(dip);
|
||||
|
||||
|
|
@ -298,7 +298,7 @@ static int jfs_mkdir(struct inode *dip, struct dentry *dentry, umode_t mode)
|
|||
|
||||
/* update parent directory inode */
|
||||
inc_nlink(dip); /* for '..' from child directory */
|
||||
dip->i_ctime = dip->i_mtime = CURRENT_TIME;
|
||||
dip->i_ctime = dip->i_mtime = current_time(dip);
|
||||
mark_inode_dirty(dip);
|
||||
|
||||
rc = txCommit(tid, 2, &iplist[0], 0);
|
||||
|
|
@ -406,7 +406,7 @@ static int jfs_rmdir(struct inode *dip, struct dentry *dentry)
|
|||
/* update parent directory's link count corresponding
|
||||
* to ".." entry of the target directory deleted
|
||||
*/
|
||||
dip->i_ctime = dip->i_mtime = CURRENT_TIME;
|
||||
dip->i_ctime = dip->i_mtime = current_time(dip);
|
||||
inode_dec_link_count(dip);
|
||||
|
||||
/*
|
||||
|
|
@ -528,7 +528,7 @@ static int jfs_unlink(struct inode *dip, struct dentry *dentry)
|
|||
|
||||
ASSERT(ip->i_nlink);
|
||||
|
||||
ip->i_ctime = dip->i_ctime = dip->i_mtime = CURRENT_TIME;
|
||||
ip->i_ctime = dip->i_ctime = dip->i_mtime = current_time(ip);
|
||||
mark_inode_dirty(dip);
|
||||
|
||||
/* update target's inode */
|
||||
|
|
@ -838,8 +838,8 @@ static int jfs_link(struct dentry *old_dentry,
|
|||
|
||||
/* update object inode */
|
||||
inc_nlink(ip); /* for new link */
|
||||
ip->i_ctime = CURRENT_TIME;
|
||||
dir->i_ctime = dir->i_mtime = CURRENT_TIME;
|
||||
ip->i_ctime = current_time(ip);
|
||||
dir->i_ctime = dir->i_mtime = current_time(dir);
|
||||
mark_inode_dirty(dir);
|
||||
ihold(ip);
|
||||
|
||||
|
|
@ -1039,7 +1039,7 @@ static int jfs_symlink(struct inode *dip, struct dentry *dentry,
|
|||
|
||||
mark_inode_dirty(ip);
|
||||
|
||||
dip->i_ctime = dip->i_mtime = CURRENT_TIME;
|
||||
dip->i_ctime = dip->i_mtime = current_time(dip);
|
||||
mark_inode_dirty(dip);
|
||||
/*
|
||||
* commit update of parent directory and link object
|
||||
|
|
@ -1215,7 +1215,7 @@ static int jfs_rename(struct inode *old_dir, struct dentry *old_dentry,
|
|||
tblk->xflag |= COMMIT_DELETE;
|
||||
tblk->u.ip = new_ip;
|
||||
} else {
|
||||
new_ip->i_ctime = CURRENT_TIME;
|
||||
new_ip->i_ctime = current_time(new_ip);
|
||||
mark_inode_dirty(new_ip);
|
||||
}
|
||||
} else {
|
||||
|
|
@ -1278,7 +1278,7 @@ static int jfs_rename(struct inode *old_dir, struct dentry *old_dentry,
|
|||
/*
|
||||
* Update ctime on changed/moved inodes & mark dirty
|
||||
*/
|
||||
old_ip->i_ctime = CURRENT_TIME;
|
||||
old_ip->i_ctime = current_time(old_ip);
|
||||
mark_inode_dirty(old_ip);
|
||||
|
||||
new_dir->i_ctime = new_dir->i_mtime = current_fs_time(new_dir->i_sb);
|
||||
|
|
@ -1293,7 +1293,7 @@ static int jfs_rename(struct inode *old_dir, struct dentry *old_dentry,
|
|||
|
||||
if (old_dir != new_dir) {
|
||||
iplist[ipcount++] = new_dir;
|
||||
old_dir->i_ctime = old_dir->i_mtime = CURRENT_TIME;
|
||||
old_dir->i_ctime = old_dir->i_mtime = current_time(old_dir);
|
||||
mark_inode_dirty(old_dir);
|
||||
}
|
||||
|
||||
|
|
@ -1426,7 +1426,7 @@ static int jfs_mknod(struct inode *dir, struct dentry *dentry,
|
|||
|
||||
mark_inode_dirty(ip);
|
||||
|
||||
dir->i_ctime = dir->i_mtime = CURRENT_TIME;
|
||||
dir->i_ctime = dir->i_mtime = current_time(dir);
|
||||
|
||||
mark_inode_dirty(dir);
|
||||
|
||||
|
|
|
|||
|
|
@ -830,7 +830,7 @@ out:
|
|||
if (inode->i_size < off+len-towrite)
|
||||
i_size_write(inode, off+len-towrite);
|
||||
inode->i_version++;
|
||||
inode->i_mtime = inode->i_ctime = CURRENT_TIME;
|
||||
inode->i_mtime = inode->i_ctime = current_time(inode);
|
||||
mark_inode_dirty(inode);
|
||||
inode_unlock(inode);
|
||||
return len - towrite;
|
||||
|
|
|
|||
|
|
@ -658,7 +658,7 @@ static int ea_put(tid_t tid, struct inode *inode, struct ea_buffer *ea_buf,
|
|||
if (old_blocks)
|
||||
dquot_free_block(inode, old_blocks);
|
||||
|
||||
inode->i_ctime = CURRENT_TIME;
|
||||
inode->i_ctime = current_time(inode);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue