mirror of
git://git.yoctoproject.org/linux-yocto.git
synced 2025-07-05 13:25:20 +02:00
yaffs2: update VFS ctime operations to 6.6+
In 6.6+ kernels the inode ctime is hidden, and should only be accessed through accesor routines. We convert one of our calls to the accesor, but the other, we use the new "hidden" __ctime. We also convert the interator to use the shared iterator and iterator wrap routines. Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
This commit is contained in:
parent
bcd6cfcd1a
commit
d2f7b03e4a
|
@ -282,7 +282,7 @@ MODULE_PARM(yaffs_gc_control, "i");
|
|||
} while (0)
|
||||
#else
|
||||
#define update_dir_time(dir) do {\
|
||||
(dir)->i_ctime = (dir)->i_mtime = current_time(dir); \
|
||||
(dir)->i_mtime = inode_set_ctime_to_ts( dir, current_time(dir) ); \
|
||||
} while (0)
|
||||
#endif
|
||||
|
||||
|
@ -1901,7 +1901,7 @@ out:
|
|||
|
||||
return ret_val;
|
||||
}
|
||||
|
||||
WRAP_DIR_ITER(yaffs_iterate)
|
||||
#else
|
||||
|
||||
static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir)
|
||||
|
@ -2018,7 +2018,7 @@ out:
|
|||
static const struct file_operations yaffs_dir_operations = {
|
||||
.read = generic_read_dir,
|
||||
#ifdef YAFFS_USE_DIR_ITERATE
|
||||
.iterate = yaffs_iterate,
|
||||
.iterate_shared = shared_yaffs_iterate,
|
||||
#else
|
||||
.readdir = yaffs_readdir,
|
||||
#endif
|
||||
|
@ -2079,8 +2079,9 @@ static void yaffs_fill_inode_from_obj(struct inode *inode,
|
|||
inode->i_atime.tv_nsec = 0;
|
||||
inode->i_mtime.tv_sec = (time64_t) obj->yst_mtime;
|
||||
inode->i_mtime.tv_nsec = 0;
|
||||
inode->i_ctime.tv_sec = (time64_t) obj->yst_ctime;
|
||||
inode->i_ctime.tv_nsec = 0;
|
||||
//inode->i_ctime.tv_sec = (time64_t) obj->yst_ctime;
|
||||
inode->__i_ctime.tv_sec = (time64_t) obj->yst_ctime;
|
||||
inode->__i_ctime.tv_nsec = 0;
|
||||
#else
|
||||
inode->i_rdev = obj->yst_rdev;
|
||||
inode->i_atime = obj->yst_atime;
|
||||
|
|
Loading…
Reference in New Issue
Block a user