NFS: Get rid of some obsolete macros

- NFS_READTIME, NFS_CHANGE_ATTR are completely unused.
- Inline the few remaining uses of NFS_ATTRTIMEO, and remove.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

2 files changed, 3 insertions, 3 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))