diff mbox series

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

Message ID 20180618100534.1857997-1-arnd@arndb.de
State Accepted
Commit 6075e4ae6e729778ac687a9ffb0c0d5223a0a19e
Headers show
Series s390: hypfs: use ktime_get_seconds() instead of get_seconds() | expand

Commit Message

Arnd Bergmann June 18, 2018, 10:05 a.m. UTC 
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>

---
 arch/s390/hypfs/inode.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

-- 
2.9.0

Comments

Martin Schwidefsky June 18, 2018, 11:26 a.m. UTC | #1 
On Mon, 18 Jun 2018 12:05:00 +0200
Arnd Bergmann <arnd@arndb.de> wrote:

> 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>


Added to my set of patches for the next merge window.

-- 
blue skies,
   Martin.

"Reality continues to ruin my life." - Calvin.
diff mbox series

Patch

diff --git a/arch/s390/hypfs/inode.c b/arch/s390/hypfs/inode.c
index 06b513d192b9..c681329fdeec 100644
--- a/arch/s390/hypfs/inode.c
+++ b/arch/s390/hypfs/inode.c
@@ -36,7 +36,7 @@  struct hypfs_sb_info {
 	kuid_t uid;			/* uid used for files and dirs */
 	kgid_t gid;			/* gid used for files and dirs */
 	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 */
 };
 
@@ -52,7 +52,7 @@  static void hypfs_update_update(struct super_block *sb)
 	struct hypfs_sb_info *sb_info = sb->s_fs_info;
 	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);
 }
 
@@ -179,7 +179,7 @@  static ssize_t hypfs_write_iter(struct kiocb *iocb, struct iov_iter *from)
 	 *    to restart data collection in this case.
 	 */
 	mutex_lock(&fs_info->lock);
-	if (fs_info->last_update == get_seconds()) {
+	if (fs_info->last_update == ktime_get_seconds()) {
 		rc = -EBUSY;
 		goto out;
 	}