NFS: Remove unused flag NFS_INO_REVAL_PAGECACHE

Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>

diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
index 3adf8b4..f9fc506 100644 (file)
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
@@ -203,14 +203,13 @@ void nfs_set_cache_invalid(struct inode *inode, unsigned long flags)
                                   NFS_INO_INVALID_OTHER |
                                   NFS_INO_INVALID_XATTR);
                flags &= ~(NFS_INO_INVALID_CHANGE | NFS_INO_INVALID_SIZE);
-       } else if (flags & NFS_INO_REVAL_PAGECACHE)
-               flags |= NFS_INO_INVALID_CHANGE | NFS_INO_INVALID_SIZE;
+       }
 
        if (!nfs_has_xattr_cache(nfsi))
                flags &= ~NFS_INO_INVALID_XATTR;
        if (flags & NFS_INO_INVALID_DATA)
                nfs_fscache_invalidate(inode, 0);
-       flags &= ~(NFS_INO_REVAL_PAGECACHE | NFS_INO_REVAL_FORCED);
+       flags &= ~NFS_INO_REVAL_FORCED;
 
        nfsi->cache_validity |= flags;
 

diff --git a/fs/nfs/nfstrace.h b/fs/nfs/nfstrace.h
index 4611aa3..45a310b 100644 (file)
--- a/fs/nfs/nfstrace.h
+++ b/fs/nfs/nfstrace.h
@@ -21,7 +21,6 @@
                        { NFS_INO_INVALID_ATIME, "INVALID_ATIME" }, \
                        { NFS_INO_INVALID_ACCESS, "INVALID_ACCESS" }, \
                        { NFS_INO_INVALID_ACL, "INVALID_ACL" }, \
-                       { NFS_INO_REVAL_PAGECACHE, "REVAL_PAGECACHE" }, \
                        { NFS_INO_REVAL_FORCED, "REVAL_FORCED" }, \
                        { NFS_INO_INVALID_LABEL, "INVALID_LABEL" }, \
                        { NFS_INO_INVALID_CHANGE, "INVALID_CHANGE" }, \

diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h
index ce3128e..72a732a 100644 (file)
--- a/include/linux/nfs_fs.h
+++ b/include/linux/nfs_fs.h
@@ -247,7 +247,6 @@ struct nfs4_copy_state {
 #define NFS_INO_INVALID_ATIME  BIT(2)          /* cached atime is invalid */
 #define NFS_INO_INVALID_ACCESS BIT(3)          /* cached access cred invalid */
 #define NFS_INO_INVALID_ACL    BIT(4)          /* cached acls are invalid */
-#define NFS_INO_REVAL_PAGECACHE        BIT(5)          /* must revalidate pagecache */
 #define NFS_INO_REVAL_FORCED   BIT(6)          /* force revalidation ignoring a delegation */
 #define NFS_INO_INVALID_LABEL  BIT(7)          /* cached label is invalid */
 #define NFS_INO_INVALID_CHANGE BIT(8)          /* cached change is invalid */