fs: sdfat: Stop using CURRENT_TIME_SEC for Linux >= 4.9
CURRENT_TIME_SEC was removed from >= 4.12 plus it isn't y2038 safe. Use current_time and ktime_get_real_ts where appropriate.
This commit is contained in:
GrayJack
Andreas Schneider
parent
df99e52a45
commit
a4c7e654d7
9
misc.c
9
misc.c
|
|
@ -253,9 +253,15 @@ void sdfat_time_unix2fat(struct sdfat_sb_info *sbi, struct timespec *ts,
|
|||
|
||||
TIMESTAMP_T *tm_now(struct sdfat_sb_info *sbi, TIMESTAMP_T *tp)
|
||||
{
|
||||
struct timespec ts = CURRENT_TIME_SEC;
|
||||
struct timespec ts;
|
||||
DATE_TIME_T dt;
|
||||
|
||||
#if LINUX_VERSION_CODE < KERNEL_VERSION(4,8,0)
|
||||
ts = CURRENT_TIME_SEC;
|
||||
#else
|
||||
ktime_get_real_ts(&ts);
|
||||
#endif
|
||||
|
||||
sdfat_time_unix2fat(sbi, &ts, &dt);
|
||||
|
||||
tp->year = dt.Year;
|
||||
|
|
@ -378,4 +384,3 @@ void __sdfat_dmsg(int level, const char *fmt, ...)
|
|||
#endif
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
|
|||
58
sdfat.c
58
sdfat.c
|
|
@ -68,6 +68,9 @@
|
|||
/* skip iterating emit_dots when dir is empty */
|
||||
#define ITER_POS_FILLED_DOTS (2)
|
||||
|
||||
#if LINUX_VERSION_CODE < KERNEL_VERSION(4,8,0)
|
||||
#define current_time(x) (CURRENT_TIME_SEC)
|
||||
#endif
|
||||
/* type index declare at sdfat.h */
|
||||
const char *FS_TYPE_STR[] = {
|
||||
"auto",
|
||||
|
|
@ -2310,7 +2313,6 @@ static int __sdfat_create(struct inode *dir, struct dentry *dentry)
|
|||
{
|
||||
struct super_block *sb = dir->i_sb;
|
||||
struct inode *inode;
|
||||
struct timespec ts;
|
||||
FILE_ID_T fid;
|
||||
loff_t i_pos;
|
||||
int err;
|
||||
|
|
@ -2319,8 +2321,6 @@ static int __sdfat_create(struct inode *dir, struct dentry *dentry)
|
|||
|
||||
TMSG("%s entered\n", __func__);
|
||||
|
||||
ts = CURRENT_TIME_SEC;
|
||||
|
||||
err = fsapi_create(dir, (u8 *) dentry->d_name.name, FM_REGULAR, &fid);
|
||||
if (err)
|
||||
goto out;
|
||||
|
|
@ -2328,7 +2328,7 @@ static int __sdfat_create(struct inode *dir, struct dentry *dentry)
|
|||
__lock_d_revalidate(dentry);
|
||||
|
||||
dir->i_version++;
|
||||
dir->i_ctime = dir->i_mtime = dir->i_atime = ts;
|
||||
dir->i_ctime = dir->i_mtime = dir->i_atime = current_time(dir);
|
||||
if (IS_DIRSYNC(dir))
|
||||
(void) sdfat_sync_inode(dir);
|
||||
else
|
||||
|
|
@ -2341,7 +2341,7 @@ static int __sdfat_create(struct inode *dir, struct dentry *dentry)
|
|||
goto out;
|
||||
}
|
||||
inode->i_version++;
|
||||
inode->i_mtime = inode->i_atime = inode->i_ctime = ts;
|
||||
inode->i_mtime = inode->i_atime = inode->i_ctime = current_time(inode);
|
||||
/* timestamp is already written, so mark_inode_dirty() is unneeded. */
|
||||
|
||||
d_instantiate(dentry, inode);
|
||||
|
|
@ -2475,15 +2475,12 @@ static int sdfat_unlink(struct inode *dir, struct dentry *dentry)
|
|||
{
|
||||
struct inode *inode = dentry->d_inode;
|
||||
struct super_block *sb = dir->i_sb;
|
||||
struct timespec ts;
|
||||
int err;
|
||||
|
||||
__lock_super(sb);
|
||||
|
||||
TMSG("%s entered\n", __func__);
|
||||
|
||||
ts = CURRENT_TIME_SEC;
|
||||
|
||||
SDFAT_I(inode)->fid.size = i_size_read(inode);
|
||||
|
||||
__cancel_dfr_work(inode, 0, SDFAT_I(inode)->fid.size, __func__);
|
||||
|
|
@ -2495,14 +2492,14 @@ static int sdfat_unlink(struct inode *dir, struct dentry *dentry)
|
|||
__lock_d_revalidate(dentry);
|
||||
|
||||
dir->i_version++;
|
||||
dir->i_mtime = dir->i_atime = ts;
|
||||
dir->i_mtime = dir->i_atime = current_time(dir);
|
||||
if (IS_DIRSYNC(dir))
|
||||
(void) sdfat_sync_inode(dir);
|
||||
else
|
||||
mark_inode_dirty(dir);
|
||||
|
||||
clear_nlink(inode);
|
||||
inode->i_mtime = inode->i_atime = ts;
|
||||
inode->i_mtime = inode->i_atime = current_time(inode);
|
||||
sdfat_detach(inode);
|
||||
dentry->d_time = dir->i_version;
|
||||
out:
|
||||
|
|
@ -2516,7 +2513,6 @@ static int sdfat_symlink(struct inode *dir, struct dentry *dentry, const char *t
|
|||
{
|
||||
struct super_block *sb = dir->i_sb;
|
||||
struct inode *inode;
|
||||
struct timespec ts;
|
||||
FILE_ID_T fid;
|
||||
loff_t i_pos;
|
||||
int err;
|
||||
|
|
@ -2531,8 +2527,6 @@ static int sdfat_symlink(struct inode *dir, struct dentry *dentry, const char *t
|
|||
|
||||
TMSG("%s entered\n", __func__);
|
||||
|
||||
ts = CURRENT_TIME_SEC;
|
||||
|
||||
err = fsapi_create(dir, (u8 *) dentry->d_name.name, FM_SYMLINK, &fid);
|
||||
if (err)
|
||||
goto out;
|
||||
|
|
@ -2547,7 +2541,7 @@ static int sdfat_symlink(struct inode *dir, struct dentry *dentry, const char *t
|
|||
__lock_d_revalidate(dentry);
|
||||
|
||||
dir->i_version++;
|
||||
dir->i_ctime = dir->i_mtime = dir->i_atime = ts;
|
||||
dir->i_ctime = dir->i_mtime = dir->i_atime = current_time(dir);
|
||||
if (IS_DIRSYNC(dir))
|
||||
(void) sdfat_sync_inode(dir);
|
||||
else
|
||||
|
|
@ -2560,7 +2554,7 @@ static int sdfat_symlink(struct inode *dir, struct dentry *dentry, const char *t
|
|||
goto out;
|
||||
}
|
||||
inode->i_version++;
|
||||
inode->i_mtime = inode->i_atime = inode->i_ctime = ts;
|
||||
inode->i_mtime = inode->i_atime = inode->i_ctime = current_time(inode);
|
||||
/* timestamp is already written, so mark_inode_dirty() is unneeded. */
|
||||
|
||||
SDFAT_I(inode)->target = kmalloc((len+1), GFP_KERNEL);
|
||||
|
|
@ -2583,7 +2577,6 @@ static int __sdfat_mkdir(struct inode *dir, struct dentry *dentry)
|
|||
{
|
||||
struct super_block *sb = dir->i_sb;
|
||||
struct inode *inode;
|
||||
struct timespec ts;
|
||||
FILE_ID_T fid;
|
||||
loff_t i_pos;
|
||||
int err;
|
||||
|
|
@ -2592,8 +2585,6 @@ static int __sdfat_mkdir(struct inode *dir, struct dentry *dentry)
|
|||
|
||||
TMSG("%s entered\n", __func__);
|
||||
|
||||
ts = CURRENT_TIME_SEC;
|
||||
|
||||
err = fsapi_mkdir(dir, (u8 *) dentry->d_name.name, &fid);
|
||||
if (err)
|
||||
goto out;
|
||||
|
|
@ -2601,7 +2592,7 @@ static int __sdfat_mkdir(struct inode *dir, struct dentry *dentry)
|
|||
__lock_d_revalidate(dentry);
|
||||
|
||||
dir->i_version++;
|
||||
dir->i_ctime = dir->i_mtime = dir->i_atime = ts;
|
||||
dir->i_ctime = dir->i_mtime = dir->i_atime = current_time(dir);
|
||||
if (IS_DIRSYNC(dir))
|
||||
(void) sdfat_sync_inode(dir);
|
||||
else
|
||||
|
|
@ -2615,7 +2606,7 @@ static int __sdfat_mkdir(struct inode *dir, struct dentry *dentry)
|
|||
goto out;
|
||||
}
|
||||
inode->i_version++;
|
||||
inode->i_mtime = inode->i_atime = inode->i_ctime = ts;
|
||||
inode->i_mtime = inode->i_atime = inode->i_ctime = current_time(inode);
|
||||
/* timestamp is already written, so mark_inode_dirty() is unneeded. */
|
||||
|
||||
d_instantiate(dentry, inode);
|
||||
|
|
@ -2634,15 +2625,12 @@ static int sdfat_rmdir(struct inode *dir, struct dentry *dentry)
|
|||
{
|
||||
struct inode *inode = dentry->d_inode;
|
||||
struct super_block *sb = dir->i_sb;
|
||||
struct timespec ts;
|
||||
int err;
|
||||
|
||||
__lock_super(sb);
|
||||
|
||||
TMSG("%s entered\n", __func__);
|
||||
|
||||
ts = CURRENT_TIME_SEC;
|
||||
|
||||
SDFAT_I(inode)->fid.size = i_size_read(inode);
|
||||
|
||||
err = fsapi_rmdir(dir, &(SDFAT_I(inode)->fid));
|
||||
|
|
@ -2652,7 +2640,7 @@ static int sdfat_rmdir(struct inode *dir, struct dentry *dentry)
|
|||
__lock_d_revalidate(dentry);
|
||||
|
||||
dir->i_version++;
|
||||
dir->i_mtime = dir->i_atime = ts;
|
||||
dir->i_mtime = dir->i_atime = current_time(dir);
|
||||
if (IS_DIRSYNC(dir))
|
||||
(void) sdfat_sync_inode(dir);
|
||||
else
|
||||
|
|
@ -2660,7 +2648,7 @@ static int sdfat_rmdir(struct inode *dir, struct dentry *dentry)
|
|||
drop_nlink(dir);
|
||||
|
||||
clear_nlink(inode);
|
||||
inode->i_mtime = inode->i_atime = ts;
|
||||
inode->i_mtime = inode->i_atime = current_time(inode);
|
||||
sdfat_detach(inode);
|
||||
dentry->d_time = dir->i_version;
|
||||
out:
|
||||
|
|
@ -2675,7 +2663,6 @@ static int __sdfat_rename(struct inode *old_dir, struct dentry *old_dentry,
|
|||
{
|
||||
struct inode *old_inode, *new_inode;
|
||||
struct super_block *sb = old_dir->i_sb;
|
||||
struct timespec ts;
|
||||
loff_t i_pos;
|
||||
int err;
|
||||
|
||||
|
|
@ -2686,8 +2673,6 @@ static int __sdfat_rename(struct inode *old_dir, struct dentry *old_dentry,
|
|||
old_inode = old_dentry->d_inode;
|
||||
new_inode = new_dentry->d_inode;
|
||||
|
||||
ts = CURRENT_TIME_SEC;
|
||||
|
||||
SDFAT_I(old_inode)->fid.size = i_size_read(old_inode);
|
||||
|
||||
__cancel_dfr_work(old_inode, 0, 1, __func__);
|
||||
|
|
@ -2700,7 +2685,7 @@ static int __sdfat_rename(struct inode *old_dir, struct dentry *old_dentry,
|
|||
__lock_d_revalidate(new_dentry);
|
||||
|
||||
new_dir->i_version++;
|
||||
new_dir->i_ctime = new_dir->i_mtime = new_dir->i_atime = ts;
|
||||
new_dir->i_ctime = new_dir->i_mtime = new_dir->i_atime = current_time(new_dir);
|
||||
if (IS_DIRSYNC(new_dir))
|
||||
(void) sdfat_sync_inode(new_dir);
|
||||
else
|
||||
|
|
@ -2721,7 +2706,7 @@ static int __sdfat_rename(struct inode *old_dir, struct dentry *old_dentry,
|
|||
}
|
||||
|
||||
old_dir->i_version++;
|
||||
old_dir->i_ctime = old_dir->i_mtime = ts;
|
||||
old_dir->i_ctime = old_dir->i_mtime = current_time(old_dir);
|
||||
if (IS_DIRSYNC(old_dir))
|
||||
(void) sdfat_sync_inode(old_dir);
|
||||
else
|
||||
|
|
@ -2740,7 +2725,7 @@ static int __sdfat_rename(struct inode *old_dir, struct dentry *old_dentry,
|
|||
__func__);
|
||||
WARN_ON(new_inode->i_nlink == 0);
|
||||
}
|
||||
new_inode->i_ctime = ts;
|
||||
new_inode->i_ctime = current_time(new_inode);
|
||||
#if 0
|
||||
(void) sdfat_sync_inode(new_inode);
|
||||
#endif
|
||||
|
|
@ -2764,7 +2749,7 @@ static int sdfat_cont_expand(struct inode *inode, loff_t size)
|
|||
if (err)
|
||||
return err;
|
||||
|
||||
inode->i_ctime = inode->i_mtime = CURRENT_TIME_SEC;
|
||||
inode->i_ctime = inode->i_mtime = current_time(inode);
|
||||
mark_inode_dirty(inode);
|
||||
|
||||
if (!IS_SYNC(inode))
|
||||
|
|
@ -3017,7 +3002,7 @@ static void sdfat_truncate(struct inode *inode, loff_t old_size)
|
|||
if (err)
|
||||
goto out;
|
||||
|
||||
inode->i_ctime = inode->i_mtime = CURRENT_TIME_SEC;
|
||||
inode->i_ctime = inode->i_mtime = current_time(inode);
|
||||
if (IS_DIRSYNC(inode))
|
||||
(void) sdfat_sync_inode(inode);
|
||||
else
|
||||
|
|
@ -3722,7 +3707,7 @@ static int sdfat_write_end(struct file *file, struct address_space *mapping,
|
|||
sdfat_write_failed(mapping, pos+len);
|
||||
|
||||
if (!(err < 0) && !(fid->attr & ATTR_ARCHIVE)) {
|
||||
inode->i_mtime = inode->i_ctime = CURRENT_TIME_SEC;
|
||||
inode->i_mtime = inode->i_ctime = current_time(inode);
|
||||
fid->attr |= ATTR_ARCHIVE;
|
||||
mark_inode_dirty(inode);
|
||||
}
|
||||
|
|
@ -4728,12 +4713,9 @@ static int sdfat_read_root(struct inode *inode)
|
|||
{
|
||||
struct super_block *sb = inode->i_sb;
|
||||
struct sdfat_sb_info *sbi = SDFAT_SB(sb);
|
||||
struct timespec ts;
|
||||
FS_INFO_T *fsi = &(sbi->fsi);
|
||||
DIR_ENTRY_T info;
|
||||
|
||||
ts = CURRENT_TIME_SEC;
|
||||
|
||||
SDFAT_I(inode)->fid.dir.dir = fsi->root_dir;
|
||||
SDFAT_I(inode)->fid.dir.flags = 0x01;
|
||||
SDFAT_I(inode)->fid.entry = -1;
|
||||
|
|
@ -4769,7 +4751,7 @@ static int sdfat_read_root(struct inode *inode)
|
|||
SDFAT_I(inode)->i_size_ondisk = i_size_read(inode);
|
||||
|
||||
sdfat_save_attr(inode, ATTR_SUBDIR);
|
||||
inode->i_mtime = inode->i_atime = inode->i_ctime = ts;
|
||||
inode->i_mtime = inode->i_atime = inode->i_ctime = current_time(inode);
|
||||
set_nlink(inode, info.NumSubdirs + 2);
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue