udf: convert inode stamps to timespec64
PATCH 1/1 udf: convert inode stamps to timespec64
The VFS structures are finally converted to always use 64-bit timestamps, and this file system can represent a long range of on-disk timestamps already, so now let's fit in the missing bits for udf.
--- fs/udf/ialloc.c | 2 +- fs/udf/inode.c | 45 ++++++++++++++++----------------------------- fs/udf/super.c | 8 ++++---- fs/udf/udf_i.h | 2 +- fs/udf/udf_sb.h | 2 +- fs/udf/udfdecl.h | 4 ++-- fs/udf/udftime.c | 4 ++-- 7 files changed, 27 insertions(+), 40 deletions(-)
fs/udf/ialloc.c +1 -1
@@ -125,7 +125,7 @@ struct inode *udf_new_inode(struct inode *dir, umode_t mode)else iinfo->i_alloc_type =ICBTAG_FLAG_AD_LONG ; inode->i_mtime = inode->i_atime = inode->i_ctime =current_time (inode); - iinfo->i_crtime =timespec64_to_timespec (inode->i_mtime); + iinfo->i_crtime = inode->i_mtime;if (unlikely (insert_inode_locked (inode) <0 )) {make_bad_inode (inode);iput (inode);
fs/udf/inode.c +16 -29
84 lines not on this page · raw message
fs/udf/super.c +4 -4
@@ -1980,7 +1980,7 @@ static void udf_open_lvid(struct super_block *sb)struct buffer_head *bh = sbi->s_lvid_bh;struct logicalVolIntegrityDesc *lvid;struct logicalVolIntegrityDescImpUse *lvidiu; -struct timespec ts; +struct timespec64 ts;if (!bh)return ;
@@ -1992,7 +1992,7 @@ static void udf_open_lvid(struct super_block *sb)mutex_lock (&sbi->s_alloc_mutex); lvidiu->impIdent.identSuffix[0 ] =UDF_OS_CLASS_UNIX ; lvidiu->impIdent.identSuffix[1 ] =UDF_OS_ID_LINUX ; -ktime_get_real_ts (&ts); +ktime_get_real_ts64 (&ts);udf_time_to_disk_stamp (&lvid->recordingDateAndTime, ts);if (le32_to_cpu (lvid->integrityType) ==LVID_INTEGRITY_TYPE_CLOSE ) lvid->integrityType =cpu_to_le32 (LVID_INTEGRITY_TYPE_OPEN );
@@ -2017,7 +2017,7 @@ static void udf_close_lvid(struct super_block *sb)struct buffer_head *bh = sbi->s_lvid_bh;struct logicalVolIntegrityDesc *lvid;struct logicalVolIntegrityDescImpUse *lvidiu; -struct timespec ts; +struct timespec64 ts;if (!bh)return ;
@@ -2029,7 +2029,7 @@ static void udf_close_lvid(struct super_block *sb)mutex_lock (&sbi->s_alloc_mutex); lvidiu->impIdent.identSuffix[0 ] =UDF_OS_CLASS_UNIX ; lvidiu->impIdent.identSuffix[1 ] =UDF_OS_ID_LINUX ; -ktime_get_real_ts (&ts); +ktime_get_real_ts64 (&ts);udf_time_to_disk_stamp (&lvid->recordingDateAndTime, ts);if (UDF_MAX_WRITE_VERSION >le16_to_cpu (lvidiu->maxUDFWriteRev)) lvidiu->maxUDFWriteRev =cpu_to_le16 (UDF_MAX_WRITE_VERSION );
fs/udf/udf_i.h +1 -1
@@ -28,7 +28,7 @@ struct udf_ext_cache {*/ struct udf_inode_info { -struct timespec i_crtime; +struct timespec64 i_crtime;/* Physical address of inode */ struct kernel_lb_addr i_location;__u64 i_unique;
fs/udf/udf_sb.h +1 -1
@@ -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;
fs/udf/udfdecl.h +2 -2
@@ -253,8 +253,8 @@ extern struct long_ad *udf_get_filelongad(uint8_t *, int, uint32_t *, int);extern struct short_ad *udf_get_fileshortad (uint8_t *,int ,uint32_t *,int );/* udftime.c */ -extern void udf_disk_stamp_to_time (struct timespec *dest, +extern void udf_disk_stamp_to_time (struct timespec64 *dest,struct timestamp src); -extern void udf_time_to_disk_stamp (struct timestamp *dest,struct timespec src); +extern void udf_time_to_disk_stamp (struct timestamp *dest,struct timespec64 src);#endif /* __UDF_DECL_H */
fs/udf/udftime.c +2 -2
@@ -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,7 +70,7 @@ 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;int16_t offset;
Signature · 1 line
2.9.0
Hello,
Quoted 5 lines · Arnd Bergmann
The VFS structures are finally converted to always use 64-bit timestamps, and this file system can represent a long range of on-disk timestamps already, so now let's fit in the missing bits for udf.
Signed-off-by Arnd Bergmann <[email protected]>
...
fs/udf/udftime.c udf_disk_stamp_to_time(struct timespec *dest, struct timestamp src) · line 76
Quoted 9 lines
fs/udf/udftime.c +1
-1@@ -70,7 +70,7 @@ 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;int16_t offset;
Thanks for the patch! This function needs fixing up as well - 'seconds' variable needs to be time64_t now. I'll fix it up and take it to my tree.
Honza
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Quoted 10 lines · Jan Kara
fs/udf/udftime.c udf_disk_stamp_to_time(struct timespec *dest, struct timestamp src) · line 76
Quoted 7 lines
void
fs/udf/udftime.c +1
-1-udf_time_to_disk_stamp(struct timestamp *dest, struct timespec ts) +udf_time_to_disk_stamp(struct timestamp *dest, struct timespec64 ts) {long seconds;int16_t offset;Thanks for the patch! This function needs fixing up as well - 'seconds' variable needs to be
time64_tnow. I'll fix it up and take it to my tree.
Thanks a lot for spotting my mistake and fixing it up!
Arnd