mirros/rockchip-kernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ext4: use timespec64 for all inode times

Browse Source 
This is the last missing piece for the inode times on 32-bit systems:
now that VFS interfaces use timespec64, we just need to stop truncating
the tv_sec values for y2038 compatibililty.

Reviewed-by: Andreas Dilger <adilger@dilger.ca>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
This commit is contained in:
Arnd Bergmann
2018-07-29 15:51:00 -04:00
committed by Theodore Ts'o
parent 5ffff83432
commit 7b62b29320
2 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
fs/ext4/ext4.h
View File

@@ -789,17 +789,16 @@ struct move_extent {
* affected filesystem before 2242. * affected filesystem before 2242.
*/ */
static inline __le32 ext4_encode_extra_time(struct timespec *time) static inline __le32 ext4_encode_extra_time(struct timespec64 *time)
{ {
u32 extra = sizeof(time->tv_sec) > 4 ? u32 extra =((time->tv_sec - (s32)time->tv_sec) >> 32) & EXT4_EPOCH_MASK;
((time->tv_sec - (s32)time->tv_sec) >> 32) & EXT4_EPOCH_MASK : 0;
return cpu_to_le32(extra | (time->tv_nsec << EXT4_EPOCH_BITS)); return cpu_to_le32(extra | (time->tv_nsec << EXT4_EPOCH_BITS));
} }
static inline void ext4_decode_extra_time(struct timespec *time, __le32 extra) static inline void ext4_decode_extra_time(struct timespec64 *time,
__le32 extra)
{ {
if (unlikely(sizeof(time->tv_sec) > 4 && if (unlikely(extra & cpu_to_le32(EXT4_EPOCH_MASK))) {
(extra & cpu_to_le32(EXT4_EPOCH_MASK)))) {
#if 1 #if 1
/* Handle legacy encoding of pre-1970 dates with epoch /* Handle legacy encoding of pre-1970 dates with epoch
@@ -821,9 +820,8 @@ static inline void ext4_decode_extra_time(struct timespec *time, __le32 extra)
do { \ do { \
(raw_inode)->xtime = cpu_to_le32((inode)->xtime.tv_sec); \ (raw_inode)->xtime = cpu_to_le32((inode)->xtime.tv_sec); \
if (EXT4_FITS_IN_INODE(raw_inode, EXT4_I(inode), xtime ## _extra)) {\ if (EXT4_FITS_IN_INODE(raw_inode, EXT4_I(inode), xtime ## _extra)) {\
struct timespec ts = timespec64_to_timespec((inode)->xtime); \
(raw_inode)->xtime ## _extra = \ (raw_inode)->xtime ## _extra = \
ext4_encode_extra_time(&ts); \ ext4_encode_extra_time(&(inode)->xtime); \
} \ } \
} while (0) } while (0)
@@ -840,10 +838,8 @@ do { \
do { \ do { \
(inode)->xtime.tv_sec = (signed)le32_to_cpu((raw_inode)->xtime); \ (inode)->xtime.tv_sec = (signed)le32_to_cpu((raw_inode)->xtime); \
if (EXT4_FITS_IN_INODE(raw_inode, EXT4_I(inode), xtime ## _extra)) { \ if (EXT4_FITS_IN_INODE(raw_inode, EXT4_I(inode), xtime ## _extra)) { \
struct timespec ts = timespec64_to_timespec((inode)->xtime); \ ext4_decode_extra_time(&(inode)->xtime, \
ext4_decode_extra_time(&ts, \
raw_inode->xtime ## _extra); \ raw_inode->xtime ## _extra); \
(inode)->xtime = timespec_to_timespec64(ts); \
} \ } \
else \ else \
(inode)->xtime.tv_nsec = 0; \ (inode)->xtime.tv_nsec = 0; \
@@ -993,9 +989,9 @@ struct ext4_inode_info {
/* /*
* File creation time. Its function is same as that of * File creation time. Its function is same as that of
* struct timespec i_{a,c,m}time in the generic inode. * struct timespec64 i_{a,c,m}time in the generic inode.
*/ */
struct timespec i_crtime; struct timespec64 i_crtime;
/* mballoc */ /* mballoc */
struct list_head i_prealloc_list; struct list_head i_prealloc_list;

2
fs/ext4/ialloc.c
View File

@@ -1086,7 +1086,7 @@ got:
/* This is the optimal IO size (for stat), not the fs block size */ /* This is the optimal IO size (for stat), not the fs block size */
inode->i_blocks = 0; inode->i_blocks = 0;
inode->i_mtime = inode->i_atime = inode->i_ctime = current_time(inode); inode->i_mtime = inode->i_atime = inode->i_ctime = current_time(inode);
ei->i_crtime = timespec64_to_timespec(inode->i_mtime); ei->i_crtime = inode->i_mtime;
memset(ei->i_data, 0, sizeof(ei->i_data)); memset(ei->i_data, 0, sizeof(ei->i_data));
ei->i_dir_start_lookup = 0; ei->i_dir_start_lookup = 0;