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>

diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c
index bd6a910f65282a091d45749274583fd5e6e869a2..53a0070ff5df771e8db952ab6b8b0389c2a7ce51 100644 (file)
--- a/security/apparmor/apparmorfs.c
+++ b/security/apparmor/apparmorfs.c
@@ -226,7 +226,7 @@ static int __aafs_setup_d_inode(struct inode *dir, struct dentry *dentry,
 
        inode->i_ino = get_next_ino();
        inode->i_mode = mode;
-       inode->i_atime = inode->i_mtime = inode_set_ctime_current(inode);
+       simple_inode_init_ts(inode);
        inode->i_private = data;
        if (S_ISDIR(mode)) {
                inode->i_op = iops ? iops : &simple_dir_inode_operations;
@@ -1557,7 +1557,8 @@ void __aafs_profile_migrate_dents(struct aa_profile *old,
                if (new->dents[i]) {
                        struct inode *inode = d_inode(new->dents[i]);
 
-                       inode->i_mtime = inode_set_ctime_current(inode);
+                       inode_set_mtime_to_ts(inode,
+                                             inode_set_ctime_current(inode));
                }
                old->dents[i] = NULL;
        }
@@ -2543,7 +2544,7 @@ static int aa_mk_null_file(struct dentry *parent)
 
        inode->i_ino = get_next_ino();
        inode->i_mode = S_IFCHR | S_IRUGO | S_IWUGO;
-       inode->i_atime = inode->i_mtime = inode_set_ctime_current(inode);
+       simple_inode_init_ts(inode);
        init_special_inode(inode, S_IFCHR | S_IRUGO | S_IWUGO,
                           MKDEV(MEM_MAJOR, 3));
        d_instantiate(dentry, inode);

diff --git a/security/apparmor/policy_unpack.c b/security/apparmor/policy_unpack.c
index 8b8846073e142a85545b810c4a39f7a9940bb113..913ec8d0eb6392c517bc948e50bfb5bf7fdf1e7f 100644 (file)
--- a/security/apparmor/policy_unpack.c
+++ b/security/apparmor/policy_unpack.c
@@ -89,10 +89,10 @@ void __aa_loaddata_update(struct aa_loaddata *data, long revision)
                struct inode *inode;
 
                inode = d_inode(data->dents[AAFS_LOADDATA_DIR]);
-               inode->i_mtime = inode_set_ctime_current(inode);
+               inode_set_mtime_to_ts(inode, inode_set_ctime_current(inode));
 
                inode = d_inode(data->dents[AAFS_LOADDATA_REVISION]);
-               inode->i_mtime = inode_set_ctime_current(inode);
+               inode_set_mtime_to_ts(inode, inode_set_ctime_current(inode));
        }
 }