Skip to content

Commit 10fc3a1

Browse files
jtlaytongregkh
jtlayton
authored and
gregkh
committed
ocfs2: convert to new timestamp accessors
[ Upstream commit fd6acbb ] 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-54-jlayton@kernel.org Signed-off-by: Christian Brauner <brauner@kernel.org> Stable-dep-of: 8c40984 ("ocfs2: update inode fsync transaction id in ocfs2_unlink and ocfs2_link") Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 1dbb1a3 commit 10fc3a1

12 files changed

Lines changed: 77 additions & 75 deletions

File tree

‎fs/ocfs2/acl.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,8 +193,8 @@ static int ocfs2_acl_set_mode(struct inode *inode, struct buffer_head *di_bh,
193193
inode->i_mode = new_mode;
194194
inode_set_ctime_current(inode);
195195
di->i_mode = cpu_to_le16(inode->i_mode);
196-
di->i_ctime = cpu_to_le64(inode_get_ctime(inode).tv_sec);
197-
di->i_ctime_nsec = cpu_to_le32(inode_get_ctime(inode).tv_nsec);
196+
di->i_ctime = cpu_to_le64(inode_get_ctime_sec(inode));
197+
di->i_ctime_nsec = cpu_to_le32(inode_get_ctime_nsec(inode));
198198
ocfs2_update_inode_fsync_trans(handle, inode, 0);
199199

200200
ocfs2_journal_dirty(handle, di_bh);

‎fs/ocfs2/alloc.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7436,10 +7436,10 @@ int ocfs2_truncate_inline(struct inode *inode, struct buffer_head *di_bh,
74367436
}
74377437

74387438
inode->i_blocks = ocfs2_inode_sector_count(inode);
7439-
inode->i_mtime = inode_set_ctime_current(inode);
7439+
inode_set_mtime_to_ts(inode, inode_set_ctime_current(inode));
74407440

7441-
di->i_ctime = di->i_mtime = cpu_to_le64(inode_get_ctime(inode).tv_sec);
7442-
di->i_ctime_nsec = di->i_mtime_nsec = cpu_to_le32(inode_get_ctime(inode).tv_nsec);
7441+
di->i_ctime = di->i_mtime = cpu_to_le64(inode_get_ctime_sec(inode));
7442+
di->i_ctime_nsec = di->i_mtime_nsec = cpu_to_le32(inode_get_ctime_nsec(inode));
74437443

74447444
ocfs2_update_inode_fsync_trans(handle, inode, 1);
74457445
ocfs2_journal_dirty(handle, di_bh);

‎fs/ocfs2/aops.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2048,9 +2048,9 @@ int ocfs2_write_end_nolock(struct address_space *mapping,
20482048
}
20492049
inode->i_blocks = ocfs2_inode_sector_count(inode);
20502050
di->i_size = cpu_to_le64((u64)i_size_read(inode));
2051-
inode->i_mtime = inode_set_ctime_current(inode);
2052-
di->i_mtime = di->i_ctime = cpu_to_le64(inode->i_mtime.tv_sec);
2053-
di->i_mtime_nsec = di->i_ctime_nsec = cpu_to_le32(inode->i_mtime.tv_nsec);
2051+
inode_set_mtime_to_ts(inode, inode_set_ctime_current(inode));
2052+
di->i_mtime = di->i_ctime = cpu_to_le64(inode_get_mtime_sec(inode));
2053+
di->i_mtime_nsec = di->i_ctime_nsec = cpu_to_le32(inode_get_mtime_nsec(inode));
20542054
if (handle)
20552055
ocfs2_update_inode_fsync_trans(handle, inode, 1);
20562056
}

‎fs/ocfs2/dir.c‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1658,7 +1658,8 @@ int __ocfs2_add_entry(handle_t *handle,
16581658
offset, ocfs2_dir_trailer_blk_off(dir->i_sb));
16591659

16601660
if (ocfs2_dirent_would_fit(de, rec_len)) {
1661-
dir->i_mtime = inode_set_ctime_current(dir);
1661+
inode_set_mtime_to_ts(dir,
1662+
inode_set_ctime_current(dir));
16621663
retval = ocfs2_mark_inode_dirty(handle, dir, parent_fe_bh);
16631664
if (retval < 0) {
16641665
mlog_errno(retval);
@@ -2962,11 +2963,11 @@ static int ocfs2_expand_inline_dir(struct inode *dir, struct buffer_head *di_bh,
29622963
ocfs2_dinode_new_extent_list(dir, di);
29632964

29642965
i_size_write(dir, sb->s_blocksize);
2965-
dir->i_mtime = inode_set_ctime_current(dir);
2966+
inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir));
29662967

29672968
di->i_size = cpu_to_le64(sb->s_blocksize);
2968-
di->i_ctime = di->i_mtime = cpu_to_le64(inode_get_ctime(dir).tv_sec);
2969-
di->i_ctime_nsec = di->i_mtime_nsec = cpu_to_le32(inode_get_ctime(dir).tv_nsec);
2969+
di->i_ctime = di->i_mtime = cpu_to_le64(inode_get_ctime_sec(dir));
2970+
di->i_ctime_nsec = di->i_mtime_nsec = cpu_to_le32(inode_get_ctime_nsec(dir));
29702971
ocfs2_update_inode_fsync_trans(handle, dir, 1);
29712972

29722973
/*

‎fs/ocfs2/dlmfs/dlmfs.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ static struct inode *dlmfs_get_root_inode(struct super_block *sb)
337337
if (inode) {
338338
inode->i_ino = get_next_ino();
339339
inode_init_owner(&nop_mnt_idmap, inode, NULL, mode);
340-
inode->i_atime = inode->i_mtime = inode_set_ctime_current(inode);
340+
simple_inode_init_ts(inode);
341341
inc_nlink(inode);
342342

343343
inode->i_fop = &simple_dir_operations;
@@ -360,7 +360,7 @@ static struct inode *dlmfs_get_inode(struct inode *parent,
360360

361361
inode->i_ino = get_next_ino();
362362
inode_init_owner(&nop_mnt_idmap, inode, parent, mode);
363-
inode->i_atime = inode->i_mtime = inode_set_ctime_current(inode);
363+
simple_inode_init_ts(inode);
364364

365365
ip = DLMFS_I(inode);
366366
ip->ip_conn = DLMFS_I(parent)->ip_conn;

‎fs/ocfs2/dlmglue.c‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2162,7 +2162,7 @@ static void __ocfs2_stuff_meta_lvb(struct inode *inode)
21622162
struct ocfs2_inode_info *oi = OCFS2_I(inode);
21632163
struct ocfs2_lock_res *lockres = &oi->ip_inode_lockres;
21642164
struct ocfs2_meta_lvb *lvb;
2165-
struct timespec64 ctime = inode_get_ctime(inode);
2165+
struct timespec64 ts;
21662166

21672167
lvb = ocfs2_dlm_lvb(&lockres->l_lksb);
21682168

@@ -2183,12 +2183,12 @@ static void __ocfs2_stuff_meta_lvb(struct inode *inode)
21832183
lvb->lvb_igid = cpu_to_be32(i_gid_read(inode));
21842184
lvb->lvb_imode = cpu_to_be16(inode->i_mode);
21852185
lvb->lvb_inlink = cpu_to_be16(inode->i_nlink);
2186-
lvb->lvb_iatime_packed =
2187-
cpu_to_be64(ocfs2_pack_timespec(&inode->i_atime));
2188-
lvb->lvb_ictime_packed =
2189-
cpu_to_be64(ocfs2_pack_timespec(&ctime));
2190-
lvb->lvb_imtime_packed =
2191-
cpu_to_be64(ocfs2_pack_timespec(&inode->i_mtime));
2186+
ts = inode_get_atime(inode);
2187+
lvb->lvb_iatime_packed = cpu_to_be64(ocfs2_pack_timespec(&ts));
2188+
ts = inode_get_ctime(inode);
2189+
lvb->lvb_ictime_packed = cpu_to_be64(ocfs2_pack_timespec(&ts));
2190+
ts = inode_get_mtime(inode);
2191+
lvb->lvb_imtime_packed = cpu_to_be64(ocfs2_pack_timespec(&ts));
21922192
lvb->lvb_iattr = cpu_to_be32(oi->ip_attr);
21932193
lvb->lvb_idynfeatures = cpu_to_be16(oi->ip_dyn_features);
21942194
lvb->lvb_igeneration = cpu_to_be32(inode->i_generation);
@@ -2209,7 +2209,7 @@ static int ocfs2_refresh_inode_from_lvb(struct inode *inode)
22092209
struct ocfs2_inode_info *oi = OCFS2_I(inode);
22102210
struct ocfs2_lock_res *lockres = &oi->ip_inode_lockres;
22112211
struct ocfs2_meta_lvb *lvb;
2212-
struct timespec64 ctime;
2212+
struct timespec64 ts;
22132213

22142214
mlog_meta_lvb(0, lockres);
22152215

@@ -2236,13 +2236,12 @@ static int ocfs2_refresh_inode_from_lvb(struct inode *inode)
22362236
i_gid_write(inode, be32_to_cpu(lvb->lvb_igid));
22372237
inode->i_mode = be16_to_cpu(lvb->lvb_imode);
22382238
set_nlink(inode, be16_to_cpu(lvb->lvb_inlink));
2239-
ocfs2_unpack_timespec(&inode->i_atime,
2240-
be64_to_cpu(lvb->lvb_iatime_packed));
2241-
ocfs2_unpack_timespec(&inode->i_mtime,
2242-
be64_to_cpu(lvb->lvb_imtime_packed));
2243-
ocfs2_unpack_timespec(&ctime,
2244-
be64_to_cpu(lvb->lvb_ictime_packed));
2245-
inode_set_ctime_to_ts(inode, ctime);
2239+
ocfs2_unpack_timespec(&ts, be64_to_cpu(lvb->lvb_iatime_packed));
2240+
inode_set_atime_to_ts(inode, ts);
2241+
ocfs2_unpack_timespec(&ts, be64_to_cpu(lvb->lvb_imtime_packed));
2242+
inode_set_mtime_to_ts(inode, ts);
2243+
ocfs2_unpack_timespec(&ts, be64_to_cpu(lvb->lvb_ictime_packed));
2244+
inode_set_ctime_to_ts(inode, ts);
22462245
spin_unlock(&oi->ip_lock);
22472246
return 0;
22482247
}

‎fs/ocfs2/file.c‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -233,16 +233,18 @@ int ocfs2_should_update_atime(struct inode *inode,
233233

234234
if (vfsmnt->mnt_flags & MNT_RELATIME) {
235235
struct timespec64 ctime = inode_get_ctime(inode);
236+
struct timespec64 atime = inode_get_atime(inode);
237+
struct timespec64 mtime = inode_get_mtime(inode);
236238

237-
if ((timespec64_compare(&inode->i_atime, &inode->i_mtime) <= 0) ||
238-
(timespec64_compare(&inode->i_atime, &ctime) <= 0))
239+
if ((timespec64_compare(&atime, &mtime) <= 0) ||
240+
(timespec64_compare(&atime, &ctime) <= 0))
239241
return 1;
240242

241243
return 0;
242244
}
243245

244246
now = current_time(inode);
245-
if ((now.tv_sec - inode->i_atime.tv_sec <= osb->s_atime_quantum))
247+
if ((now.tv_sec - inode_get_atime_sec(inode) <= osb->s_atime_quantum))
246248
return 0;
247249
else
248250
return 1;
@@ -275,9 +277,9 @@ int ocfs2_update_inode_atime(struct inode *inode,
275277
* have i_rwsem to guard against concurrent changes to other
276278
* inode fields.
277279
*/
278-
inode->i_atime = current_time(inode);
279-
di->i_atime = cpu_to_le64(inode->i_atime.tv_sec);
280-
di->i_atime_nsec = cpu_to_le32(inode->i_atime.tv_nsec);
280+
inode_set_atime_to_ts(inode, current_time(inode));
281+
di->i_atime = cpu_to_le64(inode_get_atime_sec(inode));
282+
di->i_atime_nsec = cpu_to_le32(inode_get_atime_nsec(inode));
281283
ocfs2_update_inode_fsync_trans(handle, inode, 0);
282284
ocfs2_journal_dirty(handle, bh);
283285

@@ -296,7 +298,7 @@ int ocfs2_set_inode_size(handle_t *handle,
296298

297299
i_size_write(inode, new_i_size);
298300
inode->i_blocks = ocfs2_inode_sector_count(inode);
299-
inode->i_mtime = inode_set_ctime_current(inode);
301+
inode_set_mtime_to_ts(inode, inode_set_ctime_current(inode));
300302

301303
status = ocfs2_mark_inode_dirty(handle, inode, fe_bh);
302304
if (status < 0) {
@@ -417,12 +419,12 @@ static int ocfs2_orphan_for_truncate(struct ocfs2_super *osb,
417419
}
418420

419421
i_size_write(inode, new_i_size);
420-
inode->i_mtime = inode_set_ctime_current(inode);
422+
inode_set_mtime_to_ts(inode, inode_set_ctime_current(inode));
421423

422424
di = (struct ocfs2_dinode *) fe_bh->b_data;
423425
di->i_size = cpu_to_le64(new_i_size);
424-
di->i_ctime = di->i_mtime = cpu_to_le64(inode_get_ctime(inode).tv_sec);
425-
di->i_ctime_nsec = di->i_mtime_nsec = cpu_to_le32(inode_get_ctime(inode).tv_nsec);
426+
di->i_ctime = di->i_mtime = cpu_to_le64(inode_get_ctime_sec(inode));
427+
di->i_ctime_nsec = di->i_mtime_nsec = cpu_to_le32(inode_get_ctime_nsec(inode));
426428
ocfs2_update_inode_fsync_trans(handle, inode, 0);
427429

428430
ocfs2_journal_dirty(handle, fe_bh);
@@ -821,9 +823,9 @@ static int ocfs2_write_zero_page(struct inode *inode, u64 abs_from,
821823
i_size_write(inode, abs_to);
822824
inode->i_blocks = ocfs2_inode_sector_count(inode);
823825
di->i_size = cpu_to_le64((u64)i_size_read(inode));
824-
inode->i_mtime = inode_set_ctime_current(inode);
825-
di->i_mtime = di->i_ctime = cpu_to_le64(inode->i_mtime.tv_sec);
826-
di->i_ctime_nsec = cpu_to_le32(inode->i_mtime.tv_nsec);
826+
inode_set_mtime_to_ts(inode, inode_set_ctime_current(inode));
827+
di->i_mtime = di->i_ctime = cpu_to_le64(inode_get_mtime_sec(inode));
828+
di->i_ctime_nsec = cpu_to_le32(inode_get_mtime_nsec(inode));
827829
di->i_mtime_nsec = di->i_ctime_nsec;
828830
if (handle) {
829831
ocfs2_journal_dirty(handle, di_bh);
@@ -2042,7 +2044,7 @@ static int __ocfs2_change_file_space(struct file *file, struct inode *inode,
20422044
goto out_inode_unlock;
20432045
}
20442046

2045-
inode->i_mtime = inode_set_ctime_current(inode);
2047+
inode_set_mtime_to_ts(inode, inode_set_ctime_current(inode));
20462048
ret = ocfs2_mark_inode_dirty(handle, inode, di_bh);
20472049
if (ret < 0)
20482050
mlog_errno(ret);

‎fs/ocfs2/inode.c‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -302,10 +302,10 @@ void ocfs2_populate_inode(struct inode *inode, struct ocfs2_dinode *fe,
302302
inode->i_blocks = ocfs2_inode_sector_count(inode);
303303
inode->i_mapping->a_ops = &ocfs2_aops;
304304
}
305-
inode->i_atime.tv_sec = le64_to_cpu(fe->i_atime);
306-
inode->i_atime.tv_nsec = le32_to_cpu(fe->i_atime_nsec);
307-
inode->i_mtime.tv_sec = le64_to_cpu(fe->i_mtime);
308-
inode->i_mtime.tv_nsec = le32_to_cpu(fe->i_mtime_nsec);
305+
inode_set_atime(inode, le64_to_cpu(fe->i_atime),
306+
le32_to_cpu(fe->i_atime_nsec));
307+
inode_set_mtime(inode, le64_to_cpu(fe->i_mtime),
308+
le32_to_cpu(fe->i_mtime_nsec));
309309
inode_set_ctime(inode, le64_to_cpu(fe->i_ctime),
310310
le32_to_cpu(fe->i_ctime_nsec));
311311

@@ -1312,12 +1312,12 @@ int ocfs2_mark_inode_dirty(handle_t *handle,
13121312
fe->i_uid = cpu_to_le32(i_uid_read(inode));
13131313
fe->i_gid = cpu_to_le32(i_gid_read(inode));
13141314
fe->i_mode = cpu_to_le16(inode->i_mode);
1315-
fe->i_atime = cpu_to_le64(inode->i_atime.tv_sec);
1316-
fe->i_atime_nsec = cpu_to_le32(inode->i_atime.tv_nsec);
1317-
fe->i_ctime = cpu_to_le64(inode_get_ctime(inode).tv_sec);
1318-
fe->i_ctime_nsec = cpu_to_le32(inode_get_ctime(inode).tv_nsec);
1319-
fe->i_mtime = cpu_to_le64(inode->i_mtime.tv_sec);
1320-
fe->i_mtime_nsec = cpu_to_le32(inode->i_mtime.tv_nsec);
1315+
fe->i_atime = cpu_to_le64(inode_get_atime_sec(inode));
1316+
fe->i_atime_nsec = cpu_to_le32(inode_get_atime_nsec(inode));
1317+
fe->i_ctime = cpu_to_le64(inode_get_ctime_sec(inode));
1318+
fe->i_ctime_nsec = cpu_to_le32(inode_get_ctime_nsec(inode));
1319+
fe->i_mtime = cpu_to_le64(inode_get_mtime_sec(inode));
1320+
fe->i_mtime_nsec = cpu_to_le32(inode_get_mtime_nsec(inode));
13211321

13221322
ocfs2_journal_dirty(handle, bh);
13231323
ocfs2_update_inode_fsync_trans(handle, inode, 1);
@@ -1348,10 +1348,10 @@ void ocfs2_refresh_inode(struct inode *inode,
13481348
inode->i_blocks = 0;
13491349
else
13501350
inode->i_blocks = ocfs2_inode_sector_count(inode);
1351-
inode->i_atime.tv_sec = le64_to_cpu(fe->i_atime);
1352-
inode->i_atime.tv_nsec = le32_to_cpu(fe->i_atime_nsec);
1353-
inode->i_mtime.tv_sec = le64_to_cpu(fe->i_mtime);
1354-
inode->i_mtime.tv_nsec = le32_to_cpu(fe->i_mtime_nsec);
1351+
inode_set_atime(inode, le64_to_cpu(fe->i_atime),
1352+
le32_to_cpu(fe->i_atime_nsec));
1353+
inode_set_mtime(inode, le64_to_cpu(fe->i_mtime),
1354+
le32_to_cpu(fe->i_mtime_nsec));
13551355
inode_set_ctime(inode, le64_to_cpu(fe->i_ctime),
13561356
le32_to_cpu(fe->i_ctime_nsec));
13571357

‎fs/ocfs2/move_extents.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -951,8 +951,8 @@ static int ocfs2_move_extents(struct ocfs2_move_extents_context *context)
951951

952952
di = (struct ocfs2_dinode *)di_bh->b_data;
953953
inode_set_ctime_current(inode);
954-
di->i_ctime = cpu_to_le64(inode_get_ctime(inode).tv_sec);
955-
di->i_ctime_nsec = cpu_to_le32(inode_get_ctime(inode).tv_nsec);
954+
di->i_ctime = cpu_to_le64(inode_get_ctime_sec(inode));
955+
di->i_ctime_nsec = cpu_to_le32(inode_get_ctime_nsec(inode));
956956
ocfs2_update_inode_fsync_trans(handle, inode, 0);
957957

958958
ocfs2_journal_dirty(handle, di_bh);

‎fs/ocfs2/namei.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -795,8 +795,8 @@ static int ocfs2_link(struct dentry *old_dentry,
795795
inc_nlink(inode);
796796
inode_set_ctime_current(inode);
797797
ocfs2_set_links_count(fe, inode->i_nlink);
798-
fe->i_ctime = cpu_to_le64(inode_get_ctime(inode).tv_sec);
799-
fe->i_ctime_nsec = cpu_to_le32(inode_get_ctime(inode).tv_nsec);
798+
fe->i_ctime = cpu_to_le64(inode_get_ctime_sec(inode));
799+
fe->i_ctime_nsec = cpu_to_le32(inode_get_ctime_nsec(inode));
800800
ocfs2_journal_dirty(handle, fe_bh);
801801

802802
err = ocfs2_add_entry(handle, dentry, inode,
@@ -995,7 +995,7 @@ static int ocfs2_unlink(struct inode *dir,
995995
ocfs2_set_links_count(fe, inode->i_nlink);
996996
ocfs2_journal_dirty(handle, fe_bh);
997997

998-
dir->i_mtime = inode_set_ctime_current(dir);
998+
inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir));
999999
if (S_ISDIR(inode->i_mode))
10001000
drop_nlink(dir);
10011001

@@ -1550,8 +1550,8 @@ static int ocfs2_rename(struct mnt_idmap *idmap,
15501550
if (status >= 0) {
15511551
old_di = (struct ocfs2_dinode *) old_inode_bh->b_data;
15521552

1553-
old_di->i_ctime = cpu_to_le64(inode_get_ctime(old_inode).tv_sec);
1554-
old_di->i_ctime_nsec = cpu_to_le32(inode_get_ctime(old_inode).tv_nsec);
1553+
old_di->i_ctime = cpu_to_le64(inode_get_ctime_sec(old_inode));
1554+
old_di->i_ctime_nsec = cpu_to_le32(inode_get_ctime_nsec(old_inode));
15551555
ocfs2_journal_dirty(handle, old_inode_bh);
15561556
} else
15571557
mlog_errno(status);
@@ -1592,7 +1592,7 @@ static int ocfs2_rename(struct mnt_idmap *idmap,
15921592
drop_nlink(new_inode);
15931593
inode_set_ctime_current(new_inode);
15941594
}
1595-
old_dir->i_mtime = inode_set_ctime_current(old_dir);
1595+
inode_set_mtime_to_ts(old_dir, inode_set_ctime_current(old_dir));
15961596

15971597
if (update_dot_dot) {
15981598
status = ocfs2_update_entry(old_inode, handle,
@@ -1614,8 +1614,8 @@ static int ocfs2_rename(struct mnt_idmap *idmap,
16141614

16151615
if (old_dir != new_dir) {
16161616
/* Keep the same times on both directories.*/
1617-
new_dir->i_mtime = inode_set_ctime_to_ts(new_dir,
1618-
inode_get_ctime(old_dir));
1617+
inode_set_mtime_to_ts(new_dir,
1618+
inode_set_ctime_to_ts(new_dir, inode_get_ctime(old_dir)));
16191619

16201620
/*
16211621
* This will also pick up the i_nlink change from the

0 commit comments

Comments
 (0)