3 files changed, 3 insertions, 7 deletions

diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index bdf4ba42abd7..a4fdc4cc306c 100644
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -1762,7 +1762,7 @@ static int nfs_access_get_cached(struct inode *inode, struct rpc_cred *cred, str
         cache = nfs_access_search_rbtree(inode, cred);
         if (cache == NULL)
                 goto out;
-        if (!time_in_range(jiffies, cache->jiffies, cache->jiffies + NFS_ATTRTIMEO(inode)))
+        if (!time_in_range(jiffies, cache->jiffies, cache->jiffies + nfsi->attrtimeo))
                 goto out_stale;
         res->jiffies = cache->jiffies;
         res->cred = cache->cred;
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
index 9d012a6ee4cc..469387920dd9 100644
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
@@ -117,8 +117,8 @@ static void nfs_zap_caches_locked(struct inode *inode)
 
         nfs_inc_stats(inode, NFSIOS_ATTRINVALIDATE);
 
-        NFS_ATTRTIMEO(inode) = NFS_MINATTRTIMEO(inode);
-        NFS_ATTRTIMEO_UPDATE(inode) = jiffies;
+        nfsi->attrtimeo = NFS_MINATTRTIMEO(inode);
+        nfsi->attrtimeo_timestamp = jiffies;
 
         memset(NFS_COOKIEVERF(inode), 0, sizeof(NFS_COOKIEVERF(inode)));
         if (S_ISREG(mode) || S_ISDIR(mode) || S_ISLNK(mode))
diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h
index 992931cd301e..12fe97bac9ff 100644
--- a/include/linux/nfs_fs.h
+++ b/include/linux/nfs_fs.h
@@ -203,16 +203,12 @@ static inline struct nfs_inode *NFS_I(struct inode *inode)
 #define NFS_CLIENT(inode)               (NFS_SERVER(inode)->client)
 #define NFS_PROTO(inode)                (NFS_SERVER(inode)->nfs_client->rpc_ops)
 #define NFS_COOKIEVERF(inode)           (NFS_I(inode)->cookieverf)
-#define NFS_READTIME(inode)             (NFS_I(inode)->read_cache_jiffies)
-#define NFS_CHANGE_ATTR(inode)          (NFS_I(inode)->change_attr)
-#define NFS_ATTRTIMEO(inode)            (NFS_I(inode)->attrtimeo)
 #define NFS_MINATTRTIMEO(inode) \
         (S_ISDIR(inode->i_mode)? NFS_SERVER(inode)->acdirmin \
                                : NFS_SERVER(inode)->acregmin)
 #define NFS_MAXATTRTIMEO(inode) \
         (S_ISDIR(inode->i_mode)? NFS_SERVER(inode)->acdirmax \
                                : NFS_SERVER(inode)->acregmax)
-#define NFS_ATTRTIMEO_UPDATE(inode)     (NFS_I(inode)->attrtimeo_timestamp)
 
 #define NFS_FLAGS(inode)                (NFS_I(inode)->flags)
 #define NFS_STALE(inode)                (test_bit(NFS_INO_STALE, &NFS_FLAGS(inode)))