Skip to content

Commit 7563c93

Browse files
jtlaytonbrauner
authored andcommitted
apparmor: convert to new timestamp accessors
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-82-jlayton@kernel.org Signed-off-by: Christian Brauner <brauner@kernel.org>
1 parent 5feb4b4 commit 7563c93

2 files changed

Lines changed: 6 additions & 5 deletions

File tree

security/apparmor/apparmorfs.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ static int __aafs_setup_d_inode(struct inode *dir, struct dentry *dentry,
226226

227227
inode->i_ino = get_next_ino();
228228
inode->i_mode = mode;
229-
inode->i_atime = inode->i_mtime = inode_set_ctime_current(inode);
229+
simple_inode_init_ts(inode);
230230
inode->i_private = data;
231231
if (S_ISDIR(mode)) {
232232
inode->i_op = iops ? iops : &simple_dir_inode_operations;
@@ -1557,7 +1557,8 @@ void __aafs_profile_migrate_dents(struct aa_profile *old,
15571557
if (new->dents[i]) {
15581558
struct inode *inode = d_inode(new->dents[i]);
15591559

1560-
inode->i_mtime = inode_set_ctime_current(inode);
1560+
inode_set_mtime_to_ts(inode,
1561+
inode_set_ctime_current(inode));
15611562
}
15621563
old->dents[i] = NULL;
15631564
}
@@ -2543,7 +2544,7 @@ static int aa_mk_null_file(struct dentry *parent)
25432544

25442545
inode->i_ino = get_next_ino();
25452546
inode->i_mode = S_IFCHR | S_IRUGO | S_IWUGO;
2546-
inode->i_atime = inode->i_mtime = inode_set_ctime_current(inode);
2547+
simple_inode_init_ts(inode);
25472548
init_special_inode(inode, S_IFCHR | S_IRUGO | S_IWUGO,
25482549
MKDEV(MEM_MAJOR, 3));
25492550
d_instantiate(dentry, inode);

security/apparmor/policy_unpack.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,10 @@ void __aa_loaddata_update(struct aa_loaddata *data, long revision)
8989
struct inode *inode;
9090

9191
inode = d_inode(data->dents[AAFS_LOADDATA_DIR]);
92-
inode->i_mtime = inode_set_ctime_current(inode);
92+
inode_set_mtime_to_ts(inode, inode_set_ctime_current(inode));
9393

9494
inode = d_inode(data->dents[AAFS_LOADDATA_REVISION]);
95-
inode->i_mtime = inode_set_ctime_current(inode);
95+
inode_set_mtime_to_ts(inode, inode_set_ctime_current(inode));
9696
}
9797
}
9898

0 commit comments

Comments
 (0)