diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-17 09:38:39 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-17 09:38:39 -0700 |
commit | 46e62a072a8254e9e3765fdc999aba325b7918df (patch) | |
tree | e60e7dd3a12d07ea49d53341838f8c46e484ef5b /fs/udf/udf_sb.h | |
parent | 5c60a7389d795e001c8748b458eb76e3a5b6008c (diff) | |
parent | fe2c32545bfc281122cb8b66572949a366ad747e (diff) |
Merge tag 'for_v4.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
Pull UDF and ext2 update from Jan Kara.
* tag 'for_v4.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
ext2: use ktime_get_real_seconds for timestamps
udf: convert inode stamps to timespec64
Diffstat (limited to 'fs/udf/udf_sb.h')
-rw-r--r-- | fs/udf/udf_sb.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/udf/udf_sb.h b/fs/udf/udf_sb.h index 9dd3e1b9619e..9424d7cab790 100644 --- a/fs/udf/udf_sb.h +++ b/fs/udf/udf_sb.h @@ -138,7 +138,7 @@ struct udf_sb_info { rwlock_t s_cred_lock; /* Root Info */ - struct timespec s_record_time; + struct timespec64 s_record_time; /* Fileset Info */ __u16 s_serial_number; |