CIFS: Replace clientCanCache* bools with an integer

that prepare the code to handle different types of SMB2 leases.

Signed-off-by: Pavel Shilovsky <pshilovsky@samba.org>
Signed-off-by: Steve French <smfrench@gmail.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c
index ec0f3423cdac..e3bb6477c83f 100644
--- a/fs/cifs/inode.c
+++ b/fs/cifs/inode.c
@@ -101,7 +101,7 @@ cifs_revalidate_cache(struct inode *inode, struct cifs_fattr *fattr)
         }
 
         /* don't bother with revalidation if we have an oplock */
-        if (cifs_i->clientCanCacheRead) {
+        if (CIFS_CACHE_READ(cifs_i)) {
                 cifs_dbg(FYI, "%s: inode %llu is oplocked\n",
                          __func__, cifs_i->uniqueid);
                 return;
@@ -650,7 +650,7 @@ cifs_get_inode_info(struct inode **inode, const char *full_path,
         cifs_dbg(FYI, "Getting info on %s\n", full_path);
 
         if ((data == NULL) && (*inode != NULL)) {
-                if (CIFS_I(*inode)->clientCanCacheRead) {
+                if (CIFS_CACHE_READ(CIFS_I(*inode))) {
                         cifs_dbg(FYI, "No need to revalidate cached inode sizes\n");
                         goto cgii_exit;
                 }
@@ -1661,7 +1661,7 @@ cifs_inode_needs_reval(struct inode *inode)
         struct cifsInodeInfo *cifs_i = CIFS_I(inode);
         struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb);
 
-        if (cifs_i->clientCanCacheRead)
+        if (CIFS_CACHE_READ(cifs_i))
                 return false;
 
         if (!lookupCacheEnabled)
@@ -1804,7 +1804,7 @@ int cifs_getattr(struct vfsmount *mnt, struct dentry *dentry,
          * We need to be sure that all dirty pages are written and the server
          * has actual ctime, mtime and file length.
          */
-        if (!CIFS_I(inode)->clientCanCacheRead && inode->i_mapping &&
+        if (!CIFS_CACHE_READ(CIFS_I(inode)) && inode->i_mapping &&
             inode->i_mapping->nrpages != 0) {
                 rc = filemap_fdatawait(inode->i_mapping);
                 if (rc) {