Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

s390: hypfs: use ktime_get_seconds() instead of get_seconds() 

time_t and get_seconds() are deprecated because they will overflow on
32-bit architectures in the future. This is not a problem on 64-bit s390,
but we should use proper interfaces anyway.

Besides moving to the time64_t based interface, the CLOCK_MONOTONIC
based ktime_get_seconds() is preferred for kernel internal timekeeping
because it does not behave in unexpected ways during leap second changes
or settimeofday() calls.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:
Arnd Bergmann 2018-06-18 12:05:00 +02:00 committed by Martin Schwidefsky
parent 89b5202e81
commit 6075e4ae6e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/s390/hypfs/inode.c
View File

@ -36,7 +36,7 @@ struct hypfs_sb_info {
kuid_t uid; /* uid used for files and dirs */ kuid_t uid; /* uid used for files and dirs */
kgid_t gid; /* gid used for files and dirs */ kgid_t gid; /* gid used for files and dirs */
struct dentry *update_file; /* file to trigger update */ struct dentry *update_file; /* file to trigger update */
time_t last_update; /* last update time in secs since 1970 */ time64_t last_update; /* last update, CLOCK_MONOTONIC time */
struct mutex lock; /* lock to protect update process */ struct mutex lock; /* lock to protect update process */
}; };
@ -52,7 +52,7 @@ static void hypfs_update_update(struct super_block *sb)
struct hypfs_sb_info *sb_info = sb->s_fs_info; struct hypfs_sb_info *sb_info = sb->s_fs_info;
struct inode *inode = d_inode(sb_info->update_file); struct inode *inode = d_inode(sb_info->update_file);
sb_info->last_update = get_seconds(); sb_info->last_update = ktime_get_seconds();
inode->i_atime = inode->i_mtime = inode->i_ctime = current_time(inode); inode->i_atime = inode->i_mtime = inode->i_ctime = current_time(inode);
} }
@ -179,7 +179,7 @@ static ssize_t hypfs_write_iter(struct kiocb *iocb, struct iov_iter *from)
* to restart data collection in this case. * to restart data collection in this case.
*/ */
mutex_lock(&fs_info->lock); mutex_lock(&fs_info->lock);
if (fs_info->last_update == get_seconds()) { if (fs_info->last_update == ktime_get_seconds()) {
rc = -EBUSY; rc = -EBUSY;
goto out; goto out;
} }