Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

f2fs: remain written times to update inode during fsync

This fixes xfstests/generic/392.

The failure was caused by different times between 1) one marked in the last
fsync(2) call and 2) the other given by roll-forward recovery after power-cut.
The reason was that we skipped updating inode block at 1), since its i_size
was recoverable along with 4KB-aligned data writes, which was fixed by:
"f2fs: fix a wrong condition in f2fs_skip_inode_update"

Reviewed-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

+19
+11
fs/f2fs/f2fs.h
··· 664 664 kprojid_t i_projid; /* id for project quota */ 665 665 int i_inline_xattr_size; /* inline xattr size */ 666 666 struct timespec i_crtime; /* inode creation time */ 667 + struct timespec i_disk_time[4]; /* inode disk times */ 667 668 }; 668 669 669 670 static inline void get_extent_info(struct extent_info *ext, ··· 2473 2472 if (!is_inode_flag_set(inode, FI_AUTO_RECOVER) || 2474 2473 file_keep_isize(inode) || 2475 2474 i_size_read(inode) & ~PAGE_MASK) 2475 + return false; 2476 + 2477 + if (!timespec_equal(F2FS_I(inode)->i_disk_time, &inode->i_atime)) 2478 + return false; 2479 + if (!timespec_equal(F2FS_I(inode)->i_disk_time + 1, &inode->i_ctime)) 2480 + return false; 2481 + if (!timespec_equal(F2FS_I(inode)->i_disk_time + 2, &inode->i_mtime)) 2482 + return false; 2483 + if (!timespec_equal(F2FS_I(inode)->i_disk_time + 3, 2484 + &F2FS_I(inode)->i_crtime)) 2476 2485 return false; 2477 2486 2478 2487 down_read(&F2FS_I(inode)->i_sem);
+8
fs/f2fs/inode.c
··· 284 284 fi->i_crtime.tv_nsec = le32_to_cpu(ri->i_crtime_nsec); 285 285 } 286 286 287 + F2FS_I(inode)->i_disk_time[0] = inode->i_atime; 288 + F2FS_I(inode)->i_disk_time[1] = inode->i_ctime; 289 + F2FS_I(inode)->i_disk_time[2] = inode->i_mtime; 290 + F2FS_I(inode)->i_disk_time[3] = F2FS_I(inode)->i_crtime; 287 291 f2fs_put_page(node_page, 1); 288 292 289 293 stat_inc_inline_xattr(inode); ··· 448 444 if (inode->i_nlink == 0) 449 445 clear_inline_node(node_page); 450 446 447 + F2FS_I(inode)->i_disk_time[0] = inode->i_atime; 448 + F2FS_I(inode)->i_disk_time[1] = inode->i_ctime; 449 + F2FS_I(inode)->i_disk_time[2] = inode->i_mtime; 450 + F2FS_I(inode)->i_disk_time[3] = F2FS_I(inode)->i_crtime; 451 451 } 452 452 453 453 void update_inode_page(struct inode *inode)