summaryrefslogtreecommitdiffstats
path: root/fs/udf/udftime.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-08-17 09:38:39 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2018-08-17 09:38:39 -0700
commit46e62a072a8254e9e3765fdc999aba325b7918df (patch)
treee60e7dd3a12d07ea49d53341838f8c46e484ef5b /fs/udf/udftime.c
parent5c60a7389d795e001c8748b458eb76e3a5b6008c (diff)
parentfe2c32545bfc281122cb8b66572949a366ad747e (diff)
downloadlinux-46e62a072a8254e9e3765fdc999aba325b7918df.tar.bz2
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/udftime.c')
-rw-r--r--fs/udf/udftime.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/udf/udftime.c b/fs/udf/udftime.c
index 67b33ac5d41b..fce4ad976c8c 100644
--- a/fs/udf/udftime.c
+++ b/fs/udf/udftime.c
@@ -41,7 +41,7 @@
#include <linux/time.h>
void
-udf_disk_stamp_to_time(struct timespec *dest, struct timestamp src)
+udf_disk_stamp_to_time(struct timespec64 *dest, struct timestamp src)
{
u16 typeAndTimezone = le16_to_cpu(src.typeAndTimezone);
u16 year = le16_to_cpu(src.year);
@@ -70,9 +70,9 @@ udf_disk_stamp_to_time(struct timespec *dest, struct timestamp src)
}
void
-udf_time_to_disk_stamp(struct timestamp *dest, struct timespec ts)
+udf_time_to_disk_stamp(struct timestamp *dest, struct timespec64 ts)
{
- long seconds;
+ time64_t seconds;
int16_t offset;
struct tm tm;