fat: timestamp updates
Subsystems (2)
v5 cover fat: timestamp updates
fat/msdos timestamps are stored on-disk with several different granularities, some of them lower resolution than timespec64_trunc() can provide. In addition, they are only truncated as they are written to disk, so the timestamps in-memory for new or modified files/directories may be different from the same timestamps after a remount, as the now-truncated times are re-read from the on-disk format.
These patches allow finer granularity for the timestamps where possible and add fat-specific ->update_time inode operation and fat_truncate_time functions to truncate each timestamp correctly, giving consistent times across remounts.
V5 changes
corrected some patch breakage and style issues
V4 changes
corrected to use fat_truncate_time() and keep mark_inode_dirty() set s_time_gran to 1ns unconditionally
add i_version support to update_time()
fix atime bug with localtime
Frank Sorenson (4):
fat: create a function to calculate the timezone offest
fat: add functions to update and truncate timestamps appropriately
fat: change timestamp updates to use fat_truncate_time
fat: truncate inode timestamp updates in setattr
fs/fat/dir.c | 2 +- fs/fat/fat.h | 4 +++ fs/fat/file.c | 17 ++++++++-- fs/fat/inode.c | 9 ++++-- fs/fat/misc.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++++---- fs/fat/namei_msdos.c | 17 +++++----- fs/fat/namei_vfat.c | 15 +++++---- 7 files changed, 128 insertions(+), 27 deletions(-)
Signature · 1 line
2.13.6
PATCH v5 1/4 fat: create a function to calculate the timezone offest
Move the calculation of the number of seconds in the timezone offset to a common function.
--- fs/fat/misc.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
fs/fat/misc.c +9 -7
@@ -185,6 +185,13 @@ static long days_in_year[] = { 0, 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 0, 0, 0, }; +static inline int fat_tz_offset (struct msdos_sb_info *sbi) +{ +return (sbi->options.tz_set ? + -sbi->options.time_offset : + sys_tz.tz_minuteswest) *SECS_PER_MIN ; +} +/* Convert a FAT time/date pair to a UNIX date (seconds since 1 1 70). */ void fat_time_fat2unix (struct msdos_sb_info *sbi,struct timespec64 *ts,__le16 __time,__le16 __date,u8 time_cs)
@@ -210,10 +217,7 @@ void fat_time_fat2unix(struct msdos_sb_info *sbi, struct timespec64 *ts, + days_in_year[month] + day + DAYS_DELTA) * SECS_PER_DAY; -if (!sbi->options.tz_set) - second += sys_tz.tz_minuteswest *SECS_PER_MIN ; -else - second -= sbi->options.time_offset *SECS_PER_MIN ; + second +=fat_tz_offset (sbi);if (time_cs) { ts->tv_sec = second + (time_cs /100 );
@@ -229,9 +233,7 @@ void fat_time_unix2fat(struct msdos_sb_info *sbi, struct timespec64 *ts, __le16 *time, __le16 *date, u8 *time_cs) {struct tm tm; -time64_to_tm (ts->tv_sec, - (sbi->options.tz_set ? sbi->options.time_offset : - -sys_tz.tz_minuteswest) *SECS_PER_MIN , &tm); +time64_to_tm (ts->tv_sec, -fat_tz_offset (sbi), &tm);/* FAT can only support year between 1980 to 2107 */ if (tm.tm_year <1980 -1900 ) {
Signature · 1 line
2.13.6
PATCH v5 2/4 fat: add functions to update and truncate timestamps appropriately
In reply to Frank SorensonAdd the fat-specific inode_operation ->update_time() and fat_truncate_time() function to truncate the inode timestamps from 1 nanosecond to the appropriate granularity.
--- fs/fat/fat.h | 4 +++ fs/fat/file.c | 1 + fs/fat/inode.c | 5 ++++ fs/fat/misc.c | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++++ fs/fat/namei_msdos.c | 1 + fs/fat/namei_vfat.c | 1 + 6 files changed, 87 insertions(+)
fs/fat/fat.h +4 -0
@@ -416,6 +416,10 @@ extern void fat_time_fat2unix(struct msdos_sb_info *sbi, struct timespec64 *ts, __le16 __time, __le16 __date, u8 time_cs);extern void fat_time_unix2fat (struct msdos_sb_info *sbi,struct timespec64 *ts,__le16 *time,__le16 *date,u8 *time_cs); +extern int fat_truncate_time (struct inode *inode,struct timespec64 *now, +int flags); +extern int fat_update_time (struct inode *inode,struct timespec64 *now, +int flags);extern int fat_sync_bhs (struct buffer_head **bhs,int nr_bhs);int fat_cache_init (void );
fs/fat/file.c +1 -0
@@ -552,4 +552,5 @@ EXPORT_SYMBOL_GPL(fat_setattr);const struct inode_operations fat_file_inode_operations = { .setattr = fat_setattr, .getattr = fat_getattr, + .update_time = fat_update_time, };
fs/fat/inode.c +5 -0
@@ -1626,6 +1626,11 @@ int fat_fill_super(struct super_block *sb, void *data, int silent, int isvfat, sb->s_magic =MSDOS_SUPER_MAGIC ; sb->s_op = &fat_sops; sb->s_export_op = &fat_export_ops; +/* +* fat timestamps are complex and truncated by fat itself, so +* we set 1 here to be fast +*/ + sb->s_time_gran =1 ;mutex_init (&sbi->nfs_build_inode_lock);ratelimit_state_init (&sbi->ratelimit,DEFAULT_RATELIMIT_INTERVAL ,DEFAULT_RATELIMIT_BURST );
fs/fat/misc.c +75 -0
87 lines not on this page · raw message
fs/fat/namei_msdos.c +1 -0
@@ -637,6 +637,7 @@ static const struct inode_operations msdos_dir_inode_operations = { .rename = msdos_rename, .setattr = fat_setattr, .getattr = fat_getattr, + .update_time = fat_update_time, };static void setup (struct super_block *sb)
fs/fat/namei_vfat.c +1 -0
@@ -1032,6 +1032,7 @@ static const struct inode_operations vfat_dir_inode_operations = { .rename = vfat_rename, .setattr = fat_setattr, .getattr = fat_getattr, + .update_time = fat_update_time, };static void setup (struct super_block *sb)
Signature · 1 line
2.13.6
PATCH v5 3/4 fat: change timestamp updates to use fat_truncate_time
In reply to Frank SorensonConvert the inode timestamp updates to use fat_truncate_time.
--- fs/fat/dir.c | 2 +- fs/fat/file.c | 4 ++-- fs/fat/inode.c | 4 ++-- fs/fat/namei_msdos.c | 16 ++++++++-------- fs/fat/namei_vfat.c | 14 +++++++------- 5 files changed, 20 insertions(+), 20 deletions(-)
fs/fat/dir.c +1 -1
@@ -1071,7 +1071,7 @@ int fat_remove_entries(struct inode *dir, struct fat_slot_info *sinfo) } } - dir->i_mtime = dir->i_atime =current_time (dir); +fat_truncate_time (dir,NULL ,S_ATIME |S_MTIME );if (IS_DIRSYNC (dir)) (void )fat_sync_inode (dir);else
fs/fat/file.c +2 -2
@@ -227,7 +227,7 @@ static int fat_cont_expand(struct inode *inode, loff_t size)if (err) goto out; - inode->i_ctime = inode->i_mtime =current_time (inode); +fat_truncate_time (inode,NULL ,S_CTIME |S_MTIME );mark_inode_dirty (inode);if (IS_SYNC (inode)) {int err2;
@@ -330,7 +330,7 @@ static int fat_free(struct inode *inode, int skip)MSDOS_I (inode)->i_logstart =0 ; }MSDOS_I (inode)->i_attrs |=ATTR_ARCH ; - inode->i_ctime = inode->i_mtime =current_time (inode); +fat_truncate_time (inode,NULL ,S_CTIME |S_MTIME );if (wait) { err =fat_sync_inode (inode);if (err) {
fs/fat/inode.c +2 -2
@@ -244,7 +244,7 @@ static int fat_write_end(struct file *file, struct address_space *mapping,if (err < len)fat_write_failed (mapping, pos + len);if (!(err <0 ) && !(MSDOS_I (inode)->i_attrs &ATTR_ARCH )) { - inode->i_mtime = inode->i_ctime =current_time (inode); +fat_truncate_time (inode,NULL ,S_CTIME |S_MTIME );MSDOS_I (inode)->i_attrs |=ATTR_ARCH ;mark_inode_dirty (inode); }
@@ -564,7 +564,7 @@ int fat_fill_inode(struct inode *inode, struct msdos_dir_entry *de) de->cdate, de->ctime_cs);fat_time_fat2unix (sbi, &inode->i_atime,0 , de->adate,0 ); }else - inode->i_ctime = inode->i_atime = inode->i_mtime; +fat_truncate_time (inode, &inode->i_mtime,S_ATIME |S_CTIME );return 0 ; }
fs/fat/namei_msdos.c +8 -8
@@ -250,7 +250,7 @@ static int msdos_add_entry(struct inode *dir, const unsigned char *name,if (err)return err; - dir->i_ctime = dir->i_mtime = *ts; +fat_truncate_time (dir, ts,S_CTIME |S_MTIME );if (IS_DIRSYNC (dir)) (void )fat_sync_inode (dir);else
@@ -294,7 +294,7 @@ static int msdos_create(struct inode *dir, struct dentry *dentry, umode_t mode, err =PTR_ERR (inode); goto out; } - inode->i_mtime = inode->i_atime = inode->i_ctime = ts; +fat_truncate_time (inode, &ts,S_ATIME |S_CTIME |S_MTIME );/* timestamp is already written, so mark_inode_dirty() is unneeded. */ d_instantiate (dentry, inode);
@@ -327,7 +327,7 @@ static int msdos_rmdir(struct inode *dir, struct dentry *dentry)drop_nlink (dir);clear_nlink (inode); - inode->i_ctime =current_time (inode); +fat_truncate_time (inode,NULL ,S_CTIME );fat_detach (inode); out:mutex_unlock (&MSDOS_SB (sb)->s_lock);
@@ -380,7 +380,7 @@ static int msdos_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode) goto out; }set_nlink (inode,2 ); - inode->i_mtime = inode->i_atime = inode->i_ctime = ts; +fat_truncate_time (inode, &ts,S_ATIME |S_CTIME |S_MTIME );/* timestamp is already written, so mark_inode_dirty() is unneeded. */ d_instantiate (dentry, inode);
@@ -413,7 +413,7 @@ static int msdos_unlink(struct inode *dir, struct dentry *dentry)if (err) goto out;clear_nlink (inode); - inode->i_ctime =current_time (inode); +fat_truncate_time (inode,NULL ,S_CTIME );fat_detach (inode); out:mutex_unlock (&MSDOS_SB (sb)->s_lock);
@@ -478,7 +478,7 @@ static int do_msdos_rename(struct inode *old_dir, unsigned char *old_name,mark_inode_dirty (old_inode);inode_inc_iversion (old_dir); - old_dir->i_ctime = old_dir->i_mtime =current_time (old_dir); +fat_truncate_time (old_dir,NULL ,S_CTIME |S_MTIME );if (IS_DIRSYNC (old_dir)) (void )fat_sync_inode (old_dir);else
@@ -538,7 +538,7 @@ static int do_msdos_rename(struct inode *old_dir, unsigned char *old_name,if (err) goto error_dotdot;inode_inc_iversion (old_dir); - old_dir->i_ctime = old_dir->i_mtime = ts; +fat_truncate_time (old_dir, &ts,S_CTIME |S_MTIME );if (IS_DIRSYNC (old_dir)) (void )fat_sync_inode (old_dir);else
@@ -548,7 +548,7 @@ static int do_msdos_rename(struct inode *old_dir, unsigned char *old_name,drop_nlink (new_inode);if (is_dir)drop_nlink (new_inode); - new_inode->i_ctime = ts; +fat_truncate_time (new_inode, &ts,S_CTIME ); } out:brelse (sinfo.bh);
fs/fat/namei_vfat.c +7 -7
@@ -678,7 +678,7 @@ static int vfat_add_entry(struct inode *dir, const struct qstr *qname, goto cleanup;/* update timestamp */ - dir->i_ctime = dir->i_mtime = dir->i_atime = *ts; +fat_truncate_time (dir, ts,S_CTIME |S_MTIME );if (IS_DIRSYNC (dir)) (void )fat_sync_inode (dir);else
@@ -779,7 +779,7 @@ static int vfat_create(struct inode *dir, struct dentry *dentry, umode_t mode, goto out; }inode_inc_iversion (inode); - inode->i_mtime = inode->i_atime = inode->i_ctime = ts; +fat_truncate_time (inode, &ts,S_ATIME |S_CTIME |S_MTIME );/* timestamp is already written, so mark_inode_dirty() is unneeded. */ d_instantiate (dentry, inode);
@@ -810,7 +810,7 @@ static int vfat_rmdir(struct inode *dir, struct dentry *dentry)drop_nlink (dir);clear_nlink (inode); - inode->i_mtime = inode->i_atime =current_time (inode); +fat_truncate_time (inode,NULL ,S_ATIME |S_MTIME );fat_detach (inode);vfat_d_version_set (dentry,inode_query_iversion (dir)); out:
@@ -836,7 +836,7 @@ static int vfat_unlink(struct inode *dir, struct dentry *dentry)if (err) goto out;clear_nlink (inode); - inode->i_mtime = inode->i_atime =current_time (inode); +fat_truncate_time (inode,NULL ,S_ATIME |S_MTIME );fat_detach (inode);vfat_d_version_set (dentry,inode_query_iversion (dir)); out:
@@ -876,7 +876,7 @@ static int vfat_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode) }inode_inc_iversion (inode);set_nlink (inode,2 ); - inode->i_mtime = inode->i_atime = inode->i_ctime = ts; +fat_truncate_time (inode, &ts,S_ATIME |S_CTIME |S_MTIME );/* timestamp is already written, so mark_inode_dirty() is unneeded. */ d_instantiate (dentry, inode);
@@ -969,7 +969,7 @@ static int vfat_rename(struct inode *old_dir, struct dentry *old_dentry,if (err) goto error_dotdot;inode_inc_iversion (old_dir); - old_dir->i_ctime = old_dir->i_mtime = ts; +fat_truncate_time (old_dir, &ts,S_CTIME |S_MTIME );if (IS_DIRSYNC (old_dir)) (void )fat_sync_inode (old_dir);else
@@ -979,7 +979,7 @@ static int vfat_rename(struct inode *old_dir, struct dentry *old_dentry,drop_nlink (new_inode);if (is_dir)drop_nlink (new_inode); - new_inode->i_ctime = ts; +fat_truncate_time (new_inode, &ts,S_CTIME ); } out:brelse (sinfo.bh);
Signature · 1 line
2.13.6
PATCH v5 4/4 fat: truncate inode timestamp updates in setattr
In reply to Frank Sorensonsetattr_copy can't truncate timestamps correctly for msdos/vfat, so truncate and copy them ourselves.
--- fs/fat/file.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
fs/fat/file.c +12 -0
@@ -542,6 +542,18 @@ int fat_setattr(struct dentry *dentry, struct iattr *attr)up_write (&MSDOS_I (inode)->truncate_lock); } +/* +* setattr_copy can't truncate these appropriately, so we'll +* copy them ourselves +*/ +if (attr->ia_valid &ATTR_ATIME ) +fat_truncate_time (inode, &attr->ia_atime,S_ATIME ); +if (attr->ia_valid &ATTR_CTIME ) +fat_truncate_time (inode, &attr->ia_ctime,S_CTIME ); +if (attr->ia_valid &ATTR_MTIME ) +fat_truncate_time (inode, &attr->ia_mtime,S_MTIME ); + attr->ia_valid &= ~(ATTR_ATIME |ATTR_CTIME |ATTR_MTIME ); +setattr_copy (inode, attr);mark_inode_dirty (inode); out:
Signature · 1 line
2.13.6
Quoted 8 lines · Frank Sorenson
fat/msdos timestamps are stored on-disk with several different granularities, some of them lower resolution than
timespec64_trunc()can provide. In addition, they are only truncated as they are written to disk, so the timestamps in-memory for new or modified files/directories may be different from the same timestamps after a remount, as the now-truncated times are re-read from the on-disk format.
Quoted 4 lines
These patches allow finer granularity for the timestamps where possible and add fat-specific ->update_time inode operation and
fat_truncate_timefunctions to truncate each timestamp correctly, giving consistent times across remounts.
Whole patches needs to apply at once, so IMO this is better to be one patch though. Looks good to me.
Thanks.
Signature · 1 line
OGAWA Hirofumi <[email protected]>