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>

diff --git a/fs/udf/inode.c b/fs/udf/inode.c
index 3c0a60dad4787d3f91a8465ef30267bbdc5eb7e5..a7646e9bdbde4be0f274582bd159b94b4ae15e89 100644 (file)
--- a/fs/udf/inode.c
+++ b/fs/udf/inode.c
@@ -1136,20 +1136,6 @@ static void __udf_read_inode(struct inode *inode)
        brelse(bh);
 }
 
-static void udf_fill_inode_time(struct timespec *tspec,
-                               const timestamp *tstamp,
-                               struct udf_sb_info *sbi)
-{
-       time_t convtime;
-       long convtime_usec;
-       if (udf_stamp_to_time(&convtime, &convtime_usec,
-                               lets_to_cpu(*tstamp))) {
-               tspec->tv_sec = convtime;
-               tspec->tv_nsec = convtime_usec * 1000;
-       } else
-               *tspec = sbi->s_record_time;
-}
-
 static void udf_fill_inode(struct inode *inode, struct buffer_head *bh)
 {
        struct fileEntry *fe;
@@ -1241,10 +1227,17 @@ static void udf_fill_inode(struct inode *inode, struct buffer_head *bh)
                inode->i_blocks = le64_to_cpu(fe->logicalBlocksRecorded) <<
                        (inode->i_sb->s_blocksize_bits - 9);
 
-               udf_fill_inode_time(&inode->i_atime, &fe->accessTime, sbi);
-               udf_fill_inode_time(&inode->i_mtime, &fe->modificationTime,
-                                   sbi);
-               udf_fill_inode_time(&inode->i_ctime, &fe->attrTime, sbi);
+               if (!udf_stamp_to_time(&inode->i_atime,
+                                       lets_to_cpu(fe->accessTime)))
+                       inode->i_atime = sbi->s_record_time;
+
+               if (!udf_stamp_to_time(&inode->i_mtime,
+                                       lets_to_cpu(fe->modificationTime)))
+                       inode->i_mtime = sbi->s_record_time;
+
+               if (!udf_stamp_to_time(&inode->i_ctime,
+                                       lets_to_cpu(fe->attrTime)))
+                       inode->i_ctime = sbi->s_record_time;
 
                iinfo->i_unique = le64_to_cpu(fe->uniqueID);
                iinfo->i_lenEAttr = le32_to_cpu(fe->lengthExtendedAttr);
@@ -1254,11 +1247,21 @@ static void udf_fill_inode(struct inode *inode, struct buffer_head *bh)
                inode->i_blocks = le64_to_cpu(efe->logicalBlocksRecorded) <<
                    (inode->i_sb->s_blocksize_bits - 9);
 
-               udf_fill_inode_time(&inode->i_atime, &efe->accessTime, sbi);
-               udf_fill_inode_time(&inode->i_mtime, &efe->modificationTime,
-                                   sbi);
-               udf_fill_inode_time(&iinfo->i_crtime, &efe->createTime, sbi);
-               udf_fill_inode_time(&inode->i_ctime, &efe->attrTime, sbi);
+               if (!udf_stamp_to_time(&inode->i_atime,
+                                       lets_to_cpu(efe->accessTime)))
+                       inode->i_atime = sbi->s_record_time;
+
+               if (!udf_stamp_to_time(&inode->i_mtime,
+                                       lets_to_cpu(efe->modificationTime)))
+                       inode->i_mtime = sbi->s_record_time;
+
+               if (!udf_stamp_to_time(&iinfo->i_crtime,
+                                       lets_to_cpu(efe->createTime)))
+                       iinfo->i_crtime = sbi->s_record_time;
+
+               if (!udf_stamp_to_time(&inode->i_ctime,
+                                       lets_to_cpu(efe->attrTime)))
+                       inode->i_ctime = sbi->s_record_time;
 
                iinfo->i_unique = le64_to_cpu(efe->uniqueID);
                iinfo->i_lenEAttr = le32_to_cpu(efe->lengthExtendedAttr);

diff --git a/fs/udf/super.c b/fs/udf/super.c
index be0aa424b8f18ee0e014d7ec19a42b5c42619748..f4cdd530c65ff9a48637138828a8009b07c356ce 100644 (file)
--- a/fs/udf/super.c
+++ b/fs/udf/super.c
@@ -938,24 +938,19 @@ static int udf_find_fileset(struct super_block *sb,
 static void udf_load_pvoldesc(struct super_block *sb, struct buffer_head *bh)
 {
        struct primaryVolDesc *pvoldesc;
-       time_t recording;
-       long recording_usec;
        struct ustr instr;
        struct ustr outstr;
 
        pvoldesc = (struct primaryVolDesc *)bh->b_data;
 
-       if (udf_stamp_to_time(&recording, &recording_usec,
+       if (udf_stamp_to_time(&UDF_SB(sb)->s_record_time,
                              lets_to_cpu(pvoldesc->recordingDateAndTime))) {
                kernel_timestamp ts;
                ts = lets_to_cpu(pvoldesc->recordingDateAndTime);
-               udf_debug("recording time %ld/%ld, %04u/%02u/%02u"
+               udf_debug("recording time %04u/%02u/%02u"
                          " %02u:%02u (%x)\n",
-                         recording, recording_usec,
                          ts.year, ts.month, ts.day, ts.hour,
                          ts.minute, ts.typeAndTimezone);
-               UDF_SB(sb)->s_record_time.tv_sec = recording;
-               UDF_SB(sb)->s_record_time.tv_nsec = recording_usec * 1000;
        }
 
        if (!udf_build_ustr(&instr, pvoldesc->volIdent, 32))

diff --git a/fs/udf/udfdecl.h b/fs/udf/udfdecl.h
index cc15f58d497ab79fbf3a7278ab92fee13d1c112a..b277524fe608f43db893f1e3be938f0ed1169d32 100644 (file)
--- a/fs/udf/udfdecl.h
+++ b/fs/udf/udfdecl.h
@@ -222,7 +222,7 @@ extern short_ad *udf_get_fileshortad(uint8_t *, int, uint32_t *, int);
 extern uint16_t udf_crc(const uint8_t *, uint32_t, uint16_t);
 
 /* udftime.c */
-extern time_t *udf_stamp_to_time(time_t *, long *, kernel_timestamp);
-extern kernel_timestamp *udf_time_to_stamp(kernel_timestamp *, struct timespec);
+extern struct timespec *udf_stamp_to_time(struct timespec *dest, kernel_timestamp src);
+extern kernel_timestamp *udf_time_to_stamp(kernel_timestamp *dest, struct timespec src);
 
 #endif                         /* __UDF_DECL_H */

diff --git a/fs/udf/udftime.c b/fs/udf/udftime.c
index ce595732ba6f37e0fd697ddc3ca4cfe9ab5f9423..12fae6cd444cf7022c298cff931e073505c5f4dd 100644 (file)
--- a/fs/udf/udftime.c
+++ b/fs/udf/udftime.c
@@ -85,7 +85,7 @@ extern struct timezone sys_tz;
 #define SECS_PER_HOUR  (60 * 60)
 #define SECS_PER_DAY   (SECS_PER_HOUR * 24)
 
-time_t *udf_stamp_to_time(time_t *dest, long *dest_usec, kernel_timestamp src)
+struct timespec *udf_stamp_to_time(struct timespec *dest, kernel_timestamp src)
 {
        int yday;
        uint8_t type = src.typeAndTimezone >> 12;
@@ -97,23 +97,20 @@ time_t *udf_stamp_to_time(time_t *dest, long *dest_usec, kernel_timestamp src)
                offset = (offset >> 4);
                if (offset == -2047) /* unspecified offset */
                        offset = 0;
-       } else {
+       } else
                offset = 0;
-       }
 
        if ((src.year < EPOCH_YEAR) ||
            (src.year >= EPOCH_YEAR + MAX_YEAR_SECONDS)) {
-               *dest = -1;
-               *dest_usec = -1;
                return NULL;
        }
-       *dest = year_seconds[src.year - EPOCH_YEAR];
-       *dest -= offset * 60;
+       dest->tv_sec = year_seconds[src.year - EPOCH_YEAR];
+       dest->tv_sec -= offset * 60;
 
        yday = ((__mon_yday[__isleap(src.year)][src.month - 1]) + src.day - 1);
-       *dest += (((yday * 24) + src.hour) * 60 + src.minute) * 60 + src.second;
-       *dest_usec = src.centiseconds * 10000 +
-                       src.hundredsOfMicroseconds * 100 + src.microseconds;
+       dest->tv_sec += (((yday * 24) + src.hour) * 60 + src.minute) * 60 + src.second;
+       dest->tv_nsec = 1000 * (src.centiseconds * 10000 +
+                       src.hundredsOfMicroseconds * 100 + src.microseconds);
        return dest;
 }