nfs: 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-49-jlayton@kernel.org
Signed-off-by: Christian Brauner <brauner@kernel.org>

diff --git a/fs/nfs/callback_proc.c b/fs/nfs/callback_proc.c
index 6bed1394d748946e7e10efa756bbed41f3884757..96a4923080ae2880fd3f13cd8a2261f197f24d3b 100644 (file)
--- a/fs/nfs/callback_proc.c
+++ b/fs/nfs/callback_proc.c
@@ -60,7 +60,7 @@ __be32 nfs4_callback_getattr(void *argp, void *resp,
        if (nfs_have_writebacks(inode))
                res->change_attr++;
        res->ctime = inode_get_ctime(inode);
-       res->mtime = inode->i_mtime;
+       res->mtime = inode_get_mtime(inode);
        res->bitmap[0] = (FATTR4_WORD0_CHANGE|FATTR4_WORD0_SIZE) &
                args->bitmap[0];
        res->bitmap[1] = (FATTR4_WORD1_TIME_METADATA|FATTR4_WORD1_TIME_MODIFY) &

diff --git a/fs/nfs/fscache.h b/fs/nfs/fscache.h
index 2dc64454492b04678ac5357adac9fec8516566ce..5407ab8c8783574da8c83e0e752f8d3640bfb8d7 100644 (file)
--- a/fs/nfs/fscache.h
+++ b/fs/nfs/fscache.h
@@ -114,8 +114,8 @@ static inline void nfs_fscache_update_auxdata(struct nfs_fscache_inode_auxdata *
                                              struct inode *inode)
 {
        memset(auxdata, 0, sizeof(*auxdata));
-       auxdata->mtime_sec  = inode->i_mtime.tv_sec;
-       auxdata->mtime_nsec = inode->i_mtime.tv_nsec;
+       auxdata->mtime_sec  = inode_get_mtime(inode).tv_sec;
+       auxdata->mtime_nsec = inode_get_mtime(inode).tv_nsec;
        auxdata->ctime_sec  = inode_get_ctime(inode).tv_sec;
        auxdata->ctime_nsec = inode_get_ctime(inode).tv_nsec;
 

diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
index e21c073158e5bde9ec912bee013cf1f2ff4e1b2a..ebb8d60e115269486db6c6e00a79cc32b4a28267 100644 (file)
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
@@ -512,8 +512,8 @@ nfs_fhget(struct super_block *sb, struct nfs_fh *fh, struct nfs_fattr *fattr)
                } else
                        init_special_inode(inode, inode->i_mode, fattr->rdev);
 
-               memset(&inode->i_atime, 0, sizeof(inode->i_atime));
-               memset(&inode->i_mtime, 0, sizeof(inode->i_mtime));
+               inode_set_atime(inode, 0, 0);
+               inode_set_mtime(inode, 0, 0);
                inode_set_ctime(inode, 0, 0);
                inode_set_iversion_raw(inode, 0);
                inode->i_size = 0;
@@ -527,11 +527,11 @@ nfs_fhget(struct super_block *sb, struct nfs_fh *fh, struct nfs_fattr *fattr)
                nfsi->read_cache_jiffies = fattr->time_start;
                nfsi->attr_gencount = fattr->gencount;
                if (fattr->valid & NFS_ATTR_FATTR_ATIME)
-                       inode->i_atime = fattr->atime;
+                       inode_set_atime_to_ts(inode, fattr->atime);
                else if (fattr_supported & NFS_ATTR_FATTR_ATIME)
                        nfs_set_cache_invalid(inode, NFS_INO_INVALID_ATIME);
                if (fattr->valid & NFS_ATTR_FATTR_MTIME)
-                       inode->i_mtime = fattr->mtime;
+                       inode_set_mtime_to_ts(inode, fattr->mtime);
                else if (fattr_supported & NFS_ATTR_FATTR_MTIME)
                        nfs_set_cache_invalid(inode, NFS_INO_INVALID_MTIME);
                if (fattr->valid & NFS_ATTR_FATTR_CTIME)
@@ -742,9 +742,9 @@ void nfs_setattr_update_inode(struct inode *inode, struct iattr *attr,
                NFS_I(inode)->cache_validity &= ~(NFS_INO_INVALID_ATIME
                                | NFS_INO_INVALID_CTIME);
                if (fattr->valid & NFS_ATTR_FATTR_ATIME)
-                       inode->i_atime = fattr->atime;
+                       inode_set_atime_to_ts(inode, fattr->atime);
                else if (attr->ia_valid & ATTR_ATIME_SET)
-                       inode->i_atime = attr->ia_atime;
+                       inode_set_atime_to_ts(inode, attr->ia_atime);
                else
                        nfs_set_cache_invalid(inode, NFS_INO_INVALID_ATIME);
 
@@ -758,9 +758,9 @@ void nfs_setattr_update_inode(struct inode *inode, struct iattr *attr,
                NFS_I(inode)->cache_validity &= ~(NFS_INO_INVALID_MTIME
                                | NFS_INO_INVALID_CTIME);
                if (fattr->valid & NFS_ATTR_FATTR_MTIME)
-                       inode->i_mtime = fattr->mtime;
+                       inode_set_mtime_to_ts(inode, fattr->mtime);
                else if (attr->ia_valid & ATTR_MTIME_SET)
-                       inode->i_mtime = attr->ia_mtime;
+                       inode_set_mtime_to_ts(inode, attr->ia_mtime);
                else
                        nfs_set_cache_invalid(inode, NFS_INO_INVALID_MTIME);
 
@@ -1451,11 +1451,11 @@ static void nfs_wcc_update_inode(struct inode *inode, struct nfs_fattr *fattr)
                inode_set_ctime_to_ts(inode, fattr->ctime);
        }
 
-       ts = inode->i_mtime;
+       ts = inode_get_mtime(inode);
        if ((fattr->valid & NFS_ATTR_FATTR_PREMTIME)
                        && (fattr->valid & NFS_ATTR_FATTR_MTIME)
                        && timespec64_equal(&ts, &fattr->pre_mtime)) {
-               inode->i_mtime = fattr->mtime;
+               inode_set_mtime_to_ts(inode, fattr->mtime);
        }
        if ((fattr->valid & NFS_ATTR_FATTR_PRESIZE)
                        && (fattr->valid & NFS_ATTR_FATTR_SIZE)
@@ -1506,7 +1506,7 @@ static int nfs_check_inode_attributes(struct inode *inode, struct nfs_fattr *fat
                if ((fattr->valid & NFS_ATTR_FATTR_CHANGE) != 0 && !inode_eq_iversion_raw(inode, fattr->change_attr))
                        invalid |= NFS_INO_INVALID_CHANGE;
 
-               ts = inode->i_mtime;
+               ts = inode_get_mtime(inode);
                if ((fattr->valid & NFS_ATTR_FATTR_MTIME) && !timespec64_equal(&ts, &fattr->mtime))
                        invalid |= NFS_INO_INVALID_MTIME;
 
@@ -1534,7 +1534,7 @@ static int nfs_check_inode_attributes(struct inode *inode, struct nfs_fattr *fat
        if ((fattr->valid & NFS_ATTR_FATTR_NLINK) && inode->i_nlink != fattr->nlink)
                invalid |= NFS_INO_INVALID_NLINK;
 
-       ts = inode->i_atime;
+       ts = inode_get_atime(inode);
        if ((fattr->valid & NFS_ATTR_FATTR_ATIME) && !timespec64_equal(&ts, &fattr->atime))
                invalid |= NFS_INO_INVALID_ATIME;
 
@@ -2002,7 +2002,7 @@ int nfs_post_op_update_inode_force_wcc_locked(struct inode *inode, struct nfs_fa
        }
        if ((fattr->valid & NFS_ATTR_FATTR_MTIME) != 0 &&
                        (fattr->valid & NFS_ATTR_FATTR_PREMTIME) == 0) {
-               fattr->pre_mtime = inode->i_mtime;
+               fattr->pre_mtime = inode_get_mtime(inode);
                fattr->valid |= NFS_ATTR_FATTR_PREMTIME;
        }
        if ((fattr->valid & NFS_ATTR_FATTR_SIZE) != 0 &&
@@ -2184,7 +2184,7 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr)
        }
 
        if (fattr->valid & NFS_ATTR_FATTR_MTIME)
-               inode->i_mtime = fattr->mtime;
+               inode_set_mtime_to_ts(inode, fattr->mtime);
        else if (fattr_supported & NFS_ATTR_FATTR_MTIME)
                nfsi->cache_validity |=
                        save_cache_validity & NFS_INO_INVALID_MTIME;
@@ -2220,7 +2220,7 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr)
                        save_cache_validity & NFS_INO_INVALID_SIZE;
 
        if (fattr->valid & NFS_ATTR_FATTR_ATIME)
-               inode->i_atime = fattr->atime;
+               inode_set_atime_to_ts(inode, fattr->atime);
        else if (fattr_supported & NFS_ATTR_FATTR_ATIME)
                nfsi->cache_validity |=
                        save_cache_validity & NFS_INO_INVALID_ATIME;