diff options
author | marcin.slusarz@gmail.com <marcin.slusarz@gmail.com> | 2008-02-27 16:50:14 -0500 |
---|---|---|
committer | Jan Kara <jack@suse.cz> | 2008-04-17 08:22:29 -0400 |
commit | cbf5676a0e0463f05e5073589f3194846dfb02e7 (patch) | |
tree | 80407064556f2c7043d44533a7c9224e6af3e715 /fs/udf/super.c | |
parent | c87e8e90d0da1134e42c89dc89559f4bfe282ef9 (diff) |
udf: convert udf_stamp_to_time to return struct timespec
Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/udf/super.c')
-rw-r--r-- | fs/udf/super.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/fs/udf/super.c b/fs/udf/super.c index be0aa424b8f1..f4cdd530c65f 100644 --- a/fs/udf/super.c +++ b/fs/udf/super.c | |||
@@ -938,24 +938,19 @@ static int udf_find_fileset(struct super_block *sb, | |||
938 | static void udf_load_pvoldesc(struct super_block *sb, struct buffer_head *bh) | 938 | static void udf_load_pvoldesc(struct super_block *sb, struct buffer_head *bh) |
939 | { | 939 | { |
940 | struct primaryVolDesc *pvoldesc; | 940 | struct primaryVolDesc *pvoldesc; |
941 | time_t recording; | ||
942 | long recording_usec; | ||
943 | struct ustr instr; | 941 | struct ustr instr; |
944 | struct ustr outstr; | 942 | struct ustr outstr; |
945 | 943 | ||
946 | pvoldesc = (struct primaryVolDesc *)bh->b_data; | 944 | pvoldesc = (struct primaryVolDesc *)bh->b_data; |
947 | 945 | ||
948 | if (udf_stamp_to_time(&recording, &recording_usec, | 946 | if (udf_stamp_to_time(&UDF_SB(sb)->s_record_time, |
949 | lets_to_cpu(pvoldesc->recordingDateAndTime))) { | 947 | lets_to_cpu(pvoldesc->recordingDateAndTime))) { |
950 | kernel_timestamp ts; | 948 | kernel_timestamp ts; |
951 | ts = lets_to_cpu(pvoldesc->recordingDateAndTime); | 949 | ts = lets_to_cpu(pvoldesc->recordingDateAndTime); |
952 | udf_debug("recording time %ld/%ld, %04u/%02u/%02u" | 950 | udf_debug("recording time %04u/%02u/%02u" |
953 | " %02u:%02u (%x)\n", | 951 | " %02u:%02u (%x)\n", |
954 | recording, recording_usec, | ||
955 | ts.year, ts.month, ts.day, ts.hour, | 952 | ts.year, ts.month, ts.day, ts.hour, |
956 | ts.minute, ts.typeAndTimezone); | 953 | ts.minute, ts.typeAndTimezone); |
957 | UDF_SB(sb)->s_record_time.tv_sec = recording; | ||
958 | UDF_SB(sb)->s_record_time.tv_nsec = recording_usec * 1000; | ||
959 | } | 954 | } |
960 | 955 | ||
961 | if (!udf_build_ustr(&instr, pvoldesc->volIdent, 32)) | 956 | if (!udf_build_ustr(&instr, pvoldesc->volIdent, 32)) |