ubifs: convert to new timestamp accessors

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

kernel os linux

Convert to using the new inode timestamp accessor functions.

Signed-off-by: Jeff Layton <jlayton@kernel.org>
Link: https://lore.kernel.org/r/20231004185347.80880-71-jlayton@kernel.org
Signed-off-by: Christian Brauner <brauner@kernel.org>

authored by

Jeff Layton and committed by

Christian Brauner 2 years ago e4cfef33 079cf91e

+39 -32

5 changed files

expand all

ubifs

debug.c

dir.c

file.c

journal.c

super.c

+6 -6

fs/ubifs/debug.c

··· 237 237 pr_err("\tuid %u\n", (unsigned int)i_uid_read(inode)); 238 238 pr_err("\tgid %u\n", (unsigned int)i_gid_read(inode)); 239 239 pr_err("\tatime %u.%u\n", 240 - (unsigned int)inode->i_atime.tv_sec, 241 - (unsigned int)inode->i_atime.tv_nsec); 240 + (unsigned int) inode_get_atime_sec(inode), 241 + (unsigned int) inode_get_atime_nsec(inode)); 242 242 pr_err("\tmtime %u.%u\n", 243 - (unsigned int)inode->i_mtime.tv_sec, 244 - (unsigned int)inode->i_mtime.tv_nsec); 243 + (unsigned int) inode_get_mtime_sec(inode), 244 + (unsigned int) inode_get_mtime_nsec(inode)); 245 245 pr_err("\tctime %u.%u\n", 246 - (unsigned int) inode_get_ctime(inode).tv_sec, 247 - (unsigned int) inode_get_ctime(inode).tv_nsec); 246 + (unsigned int) inode_get_ctime_sec(inode), 247 + (unsigned int) inode_get_ctime_nsec(inode)); 248 248 pr_err("\tcreat_sqnum %llu\n", ui->creat_sqnum); 249 249 pr_err("\txattr_size %u\n", ui->xattr_size); 250 250 pr_err("\txattr_cnt %u\n", ui->xattr_cnt);

+15 -8

fs/ubifs/dir.c

··· 96 96 inode->i_flags |= S_NOCMTIME; 97 97 98 98 inode_init_owner(&nop_mnt_idmap, inode, dir, mode); 99 - inode->i_mtime = inode->i_atime = inode_set_ctime_current(inode); 99 + simple_inode_init_ts(inode); 100 100 inode->i_mapping->nrpages = 0; 101 101 102 102 if (!is_xattr) { ··· 324 324 mutex_lock(&dir_ui->ui_mutex); 325 325 dir->i_size += sz_change; 326 326 dir_ui->ui_size = dir->i_size; 327 - dir->i_mtime = inode_set_ctime_to_ts(dir, inode_get_ctime(inode)); 327 + inode_set_mtime_to_ts(dir, 328 + inode_set_ctime_to_ts(dir, inode_get_ctime(inode))); 328 329 err = ubifs_jnl_update(c, dir, &nm, inode, 0, 0); 329 330 if (err) 330 331 goto out_cancel; ··· 768 767 inode_set_ctime_current(inode); 769 768 dir->i_size += sz_change; 770 769 dir_ui->ui_size = dir->i_size; 771 - dir->i_mtime = inode_set_ctime_to_ts(dir, inode_get_ctime(inode)); 770 + inode_set_mtime_to_ts(dir, 771 + inode_set_ctime_to_ts(dir, inode_get_ctime(inode))); 772 772 err = ubifs_jnl_update(c, dir, &nm, inode, 0, 0); 773 773 if (err) 774 774 goto out_cancel; ··· 843 841 drop_nlink(inode); 844 842 dir->i_size -= sz_change; 845 843 dir_ui->ui_size = dir->i_size; 846 - dir->i_mtime = inode_set_ctime_to_ts(dir, inode_get_ctime(inode)); 844 + inode_set_mtime_to_ts(dir, 845 + inode_set_ctime_to_ts(dir, inode_get_ctime(inode))); 847 846 err = ubifs_jnl_update(c, dir, &nm, inode, 1, 0); 848 847 if (err) 849 848 goto out_cancel; ··· 947 944 drop_nlink(dir); 948 945 dir->i_size -= sz_change; 949 946 dir_ui->ui_size = dir->i_size; 950 - dir->i_mtime = inode_set_ctime_to_ts(dir, inode_get_ctime(inode)); 947 + inode_set_mtime_to_ts(dir, 948 + inode_set_ctime_to_ts(dir, inode_get_ctime(inode))); 951 949 err = ubifs_jnl_update(c, dir, &nm, inode, 1, 0); 952 950 if (err) 953 951 goto out_cancel; ··· 1022 1018 inc_nlink(dir); 1023 1019 dir->i_size += sz_change; 1024 1020 dir_ui->ui_size = dir->i_size; 1025 - dir->i_mtime = inode_set_ctime_to_ts(dir, inode_get_ctime(inode)); 1021 + inode_set_mtime_to_ts(dir, 1022 + inode_set_ctime_to_ts(dir, inode_get_ctime(inode))); 1026 1023 err = ubifs_jnl_update(c, dir, &nm, inode, 0, 0); 1027 1024 if (err) { 1028 1025 ubifs_err(c, "cannot create directory, error %d", err); ··· 1114 1109 mutex_lock(&dir_ui->ui_mutex); 1115 1110 dir->i_size += sz_change; 1116 1111 dir_ui->ui_size = dir->i_size; 1117 - dir->i_mtime = inode_set_ctime_to_ts(dir, inode_get_ctime(inode)); 1112 + inode_set_mtime_to_ts(dir, 1113 + inode_set_ctime_to_ts(dir, inode_get_ctime(inode))); 1118 1114 err = ubifs_jnl_update(c, dir, &nm, inode, 0, 0); 1119 1115 if (err) 1120 1116 goto out_cancel; ··· 1215 1209 mutex_lock(&dir_ui->ui_mutex); 1216 1210 dir->i_size += sz_change; 1217 1211 dir_ui->ui_size = dir->i_size; 1218 - dir->i_mtime = inode_set_ctime_to_ts(dir, inode_get_ctime(inode)); 1212 + inode_set_mtime_to_ts(dir, 1213 + inode_set_ctime_to_ts(dir, inode_get_ctime(inode))); 1219 1214 err = ubifs_jnl_update(c, dir, &nm, inode, 0, 0); 1220 1215 if (err) 1221 1216 goto out_cancel;

+8 -8

fs/ubifs/file.c

··· 1088 1088 if (attr->ia_valid & ATTR_GID) 1089 1089 inode->i_gid = attr->ia_gid; 1090 1090 if (attr->ia_valid & ATTR_ATIME) 1091 - inode->i_atime = attr->ia_atime; 1091 + inode_set_atime_to_ts(inode, attr->ia_atime); 1092 1092 if (attr->ia_valid & ATTR_MTIME) 1093 - inode->i_mtime = attr->ia_mtime; 1093 + inode_set_mtime_to_ts(inode, attr->ia_mtime); 1094 1094 if (attr->ia_valid & ATTR_CTIME) 1095 1095 inode_set_ctime_to_ts(inode, attr->ia_ctime); 1096 1096 if (attr->ia_valid & ATTR_MODE) { ··· 1192 1192 mutex_lock(&ui->ui_mutex); 1193 1193 ui->ui_size = inode->i_size; 1194 1194 /* Truncation changes inode [mc]time */ 1195 - inode->i_mtime = inode_set_ctime_current(inode); 1195 + inode_set_mtime_to_ts(inode, inode_set_ctime_current(inode)); 1196 1196 /* Other attributes may be changed at the same time as well */ 1197 1197 do_attr_changes(inode, attr); 1198 1198 err = ubifs_jnl_truncate(c, inode, old_size, new_size); ··· 1239 1239 mutex_lock(&ui->ui_mutex); 1240 1240 if (attr->ia_valid & ATTR_SIZE) { 1241 1241 /* Truncation changes inode [mc]time */ 1242 - inode->i_mtime = inode_set_ctime_current(inode); 1242 + inode_set_mtime_to_ts(inode, inode_set_ctime_current(inode)); 1243 1243 /* 'truncate_setsize()' changed @i_size, update @ui_size */ 1244 1244 ui->ui_size = inode->i_size; 1245 1245 } ··· 1365 1365 const struct timespec64 *now) 1366 1366 { 1367 1367 struct timespec64 ctime = inode_get_ctime(inode); 1368 + struct timespec64 mtime = inode_get_mtime(inode); 1368 1369 1369 - if (!timespec64_equal(&inode->i_mtime, now) || 1370 - !timespec64_equal(&ctime, now)) 1370 + if (!timespec64_equal(&mtime, now) || !timespec64_equal(&ctime, now)) 1371 1371 return 1; 1372 1372 return 0; 1373 1373 } ··· 1429 1429 return err; 1430 1430 1431 1431 mutex_lock(&ui->ui_mutex); 1432 - inode->i_mtime = inode_set_ctime_current(inode); 1432 + inode_set_mtime_to_ts(inode, inode_set_ctime_current(inode)); 1433 1433 release = ui->dirty; 1434 1434 mark_inode_dirty_sync(inode); 1435 1435 mutex_unlock(&ui->ui_mutex); ··· 1567 1567 struct ubifs_inode *ui = ubifs_inode(inode); 1568 1568 1569 1569 mutex_lock(&ui->ui_mutex); 1570 - inode->i_mtime = inode_set_ctime_current(inode); 1570 + inode_set_mtime_to_ts(inode, inode_set_ctime_current(inode)); 1571 1571 release = ui->dirty; 1572 1572 mark_inode_dirty_sync(inode); 1573 1573 mutex_unlock(&ui->ui_mutex);

+6 -6

fs/ubifs/journal.c

··· 452 452 ino->ch.node_type = UBIFS_INO_NODE; 453 453 ino_key_init_flash(c, &ino->key, inode->i_ino); 454 454 ino->creat_sqnum = cpu_to_le64(ui->creat_sqnum); 455 - ino->atime_sec = cpu_to_le64(inode->i_atime.tv_sec); 456 - ino->atime_nsec = cpu_to_le32(inode->i_atime.tv_nsec); 457 - ino->ctime_sec = cpu_to_le64(inode_get_ctime(inode).tv_sec); 458 - ino->ctime_nsec = cpu_to_le32(inode_get_ctime(inode).tv_nsec); 459 - ino->mtime_sec = cpu_to_le64(inode->i_mtime.tv_sec); 460 - ino->mtime_nsec = cpu_to_le32(inode->i_mtime.tv_nsec); 455 + ino->atime_sec = cpu_to_le64(inode_get_atime_sec(inode)); 456 + ino->atime_nsec = cpu_to_le32(inode_get_atime_nsec(inode)); 457 + ino->ctime_sec = cpu_to_le64(inode_get_ctime_sec(inode)); 458 + ino->ctime_nsec = cpu_to_le32(inode_get_ctime_nsec(inode)); 459 + ino->mtime_sec = cpu_to_le64(inode_get_mtime_sec(inode)); 460 + ino->mtime_nsec = cpu_to_le32(inode_get_mtime_nsec(inode)); 461 461 ino->uid = cpu_to_le32(i_uid_read(inode)); 462 462 ino->gid = cpu_to_le32(i_gid_read(inode)); 463 463 ino->mode = cpu_to_le32(inode->i_mode);

+4 -4

fs/ubifs/super.c

··· 142 142 set_nlink(inode, le32_to_cpu(ino->nlink)); 143 143 i_uid_write(inode, le32_to_cpu(ino->uid)); 144 144 i_gid_write(inode, le32_to_cpu(ino->gid)); 145 - inode->i_atime.tv_sec = (int64_t)le64_to_cpu(ino->atime_sec); 146 - inode->i_atime.tv_nsec = le32_to_cpu(ino->atime_nsec); 147 - inode->i_mtime.tv_sec = (int64_t)le64_to_cpu(ino->mtime_sec); 148 - inode->i_mtime.tv_nsec = le32_to_cpu(ino->mtime_nsec); 145 + inode_set_atime(inode, (int64_t)le64_to_cpu(ino->atime_sec), 146 + le32_to_cpu(ino->atime_nsec)); 147 + inode_set_mtime(inode, (int64_t)le64_to_cpu(ino->mtime_sec), 148 + le32_to_cpu(ino->mtime_nsec)); 149 149 inode_set_ctime(inode, (int64_t)le64_to_cpu(ino->ctime_sec), 150 150 le32_to_cpu(ino->ctime_nsec)); 151 151 inode->i_mode = le32_to_cpu(ino->mode);