From 73193347133e750faf27f88fd3ab31ce43aff062 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 21 May 2024 06:59:33 +0200 Subject: Adding upstream version 1.47.1. Signed-off-by: Daniel Baumann --- lib/ext2fs/bb_inode.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'lib/ext2fs/bb_inode.c') diff --git a/lib/ext2fs/bb_inode.c b/lib/ext2fs/bb_inode.c index 11f10eb..8b29e1c 100644 --- a/lib/ext2fs/bb_inode.c +++ b/lib/ext2fs/bb_inode.c @@ -20,7 +20,6 @@ #include #endif #include -#include #if HAVE_SYS_STAT_H #include #endif @@ -29,7 +28,7 @@ #endif #include "ext2_fs.h" -#include "ext2fs.h" +#include "ext2fsP.h" struct set_badblock_record { ext2_badblocks_iterate bb_iter; @@ -58,8 +57,9 @@ static int clear_bad_block_proc(ext2_filsys fs, blk_t *block_nr, errcode_t ext2fs_update_bb_inode(ext2_filsys fs, ext2_badblocks_list bb_list) { errcode_t retval; - struct set_badblock_record rec; + struct set_badblock_record rec; struct ext2_inode inode; + time_t now; EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS); @@ -124,9 +124,11 @@ errcode_t ext2fs_update_bb_inode(ext2_filsys fs, ext2_badblocks_list bb_list) if (retval) goto cleanup; - inode.i_atime = inode.i_mtime = fs->now ? fs->now : time(0); - if (!inode.i_ctime) - inode.i_ctime = fs->now ? fs->now : time(0); + now = ext2fsP_get_time(fs); + ext2fs_inode_xtime_set(&inode, i_atime, now); + if (!ext2fs_inode_xtime_get(&inode, i_ctime)) + ext2fs_inode_xtime_set(&inode, i_ctime, now); + ext2fs_inode_xtime_set(&inode, i_mtime, now); ext2fs_iblk_set(fs, &inode, rec.bad_block_count); retval = ext2fs_inode_size_set(fs, &inode, rec.bad_block_count * fs->blocksize); -- cgit v1.2.3