Merge branches 'work.misc' and 'work.dcache' of git://git.kernel.org/pub/scm/linux...

[sfrench/cifs-2.6.git] / arch / s390 / hypfs / inode.c

diff --git a/arch/s390/hypfs/inode.c b/arch/s390/hypfs/inode.c
index 06b513d192b9bc5cd3e589a7a220d126744cadf4..c681329fdeec6ba42c95cb321b4ea8ae23b0df06 100644 (file)
--- 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;
        }