NFS: remove jiffies field from access cache

This field hasn't been used since commit 57b691819ee2 ("NFS: Cache
access checks more aggressively").

Signed-off-by: NeilBrown <neilb@suse.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>

diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index 3522b1249019ce261db090af01baf9525302f10d..5ceaeb1f6fb69d8ce15e932ff278a70837a48a30 100644 (file)
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -2260,7 +2260,6 @@ static int nfs_access_get_cached(struct inode *inode, struct rpc_cred *cred, str
                spin_lock(&inode->i_lock);
                retry = false;
        }
-       res->jiffies = cache->jiffies;
        res->cred = cache->cred;
        res->mask = cache->mask;
        list_move_tail(&cache->lru, &nfsi->access_cache_entry_lru);
@@ -2296,7 +2295,6 @@ static int nfs_access_get_cached_rcu(struct inode *inode, struct rpc_cred *cred,
                goto out;
        if (nfs_check_cache_invalid(inode, NFS_INO_INVALID_ACCESS))
                goto out;
-       res->jiffies = cache->jiffies;
        res->cred = cache->cred;
        res->mask = cache->mask;
        err = 0;
@@ -2344,7 +2342,6 @@ void nfs_access_add_cache(struct inode *inode, struct nfs_access_entry *set)
        if (cache == NULL)
                return;
        RB_CLEAR_NODE(&cache->rb_node);
-       cache->jiffies = set->jiffies;
        cache->cred = get_rpccred(set->cred);
        cache->mask = set->mask;
 
@@ -2432,7 +2429,6 @@ static int nfs_do_access(struct inode *inode, struct rpc_cred *cred, int mask)
        cache.mask = NFS_MAY_LOOKUP | NFS_MAY_EXECUTE
                     | NFS_MAY_WRITE | NFS_MAY_READ;
        cache.cred = cred;
-       cache.jiffies = jiffies;
        status = NFS_PROTO(inode)->access(inode, &cache);
        if (status != 0) {
                if (status == -ESTALE) {

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 08cc97488904b70b5a524efd4936dfd68ecec818..6c61e2b996351cde05b1c922674cd3a2670913ea 100644 (file)
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -2285,7 +2285,6 @@ static int nfs4_opendata_access(struct rpc_cred *cred,
                mask = NFS4_ACCESS_READ;
 
        cache.cred = cred;
-       cache.jiffies = jiffies;
        nfs_access_set_mask(&cache, opendata->o_res.access_result);
        nfs_access_add_cache(state->inode, &cache);
 

diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h
index 238fdc4c46df8207efa06dca1cf125bda74e8a87..a0282ceaa48b7a2ac71cf3c5942169096289c7a6 100644 (file)
--- a/include/linux/nfs_fs.h
+++ b/include/linux/nfs_fs.h
@@ -49,7 +49,6 @@
 struct nfs_access_entry {
        struct rb_node          rb_node;
        struct list_head        lru;
-       unsigned long           jiffies;
        struct rpc_cred *       cred;
        __u32                   mask;
        struct rcu_head         rcu_head;