1 files changed, 14 insertions, 14 deletions

diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index 9d0dd952ad79..ad14d3c66b25 100644
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -1524,12 +1524,12 @@ cifs_setlk(struct file *file, struct file_lock *flock, __u32 type,
                  * read won't conflict with non-overlapted locks due to
                  * pagereading.
                  */
-                if (!CIFS_I(inode)->clientCanCacheAll &&
-                                        CIFS_I(inode)->clientCanCacheRead) {
+                if (!CIFS_CACHE_WRITE(CIFS_I(inode)) &&
+                                        CIFS_CACHE_READ(CIFS_I(inode))) {
                         cifs_invalidate_mapping(inode);
                         cifs_dbg(FYI, "Set no oplock for inode=%p due to mand locks\n",
                                  inode);
-                        CIFS_I(inode)->clientCanCacheRead = false;
+                        CIFS_I(inode)->oplock = 0;
                 }
 
                 rc = server->ops->mand_lock(xid, cfile, flock->fl_start, length,
@@ -2213,7 +2213,7 @@ int cifs_strict_fsync(struct file *file, loff_t start, loff_t end,
         cifs_dbg(FYI, "Sync file - name: %s datasync: 0x%x\n",
                  file->f_path.dentry->d_name.name, datasync);
 
-        if (!CIFS_I(inode)->clientCanCacheRead) {
+        if (!CIFS_CACHE_READ(CIFS_I(inode))) {
                 rc = cifs_invalidate_mapping(inode);
                 if (rc) {
                         cifs_dbg(FYI, "rc: %d during invalidate phase\n", rc);
@@ -2577,7 +2577,7 @@ cifs_strict_writev(struct kiocb *iocb, const struct iovec *iov,
         struct cifs_tcon *tcon = tlink_tcon(cfile->tlink);
         ssize_t written;
 
-        if (cinode->clientCanCacheAll) {
+        if (CIFS_CACHE_WRITE(cinode)) {
                 if (cap_unix(tcon->ses) &&
                 (CIFS_UNIX_FCNTL_CAP & le64_to_cpu(tcon->fsUnixInfo.Capability))
                     && ((cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NOPOSIXBRL) == 0))
@@ -2591,7 +2591,7 @@ cifs_strict_writev(struct kiocb *iocb, const struct iovec *iov,
          * these pages but not on the region from pos to ppos+len-1.
          */
         written = cifs_user_writev(iocb, iov, nr_segs, pos);
-        if (written > 0 && cinode->clientCanCacheRead) {
+        if (written > 0 && CIFS_CACHE_READ(cinode)) {
                 /*
                  * Windows 7 server can delay breaking level2 oplock if a write
                  * request comes - break it on the client to prevent reading
@@ -2600,7 +2600,7 @@ cifs_strict_writev(struct kiocb *iocb, const struct iovec *iov,
                 cifs_invalidate_mapping(inode);
                 cifs_dbg(FYI, "Set no oplock for inode=%p after a write operation\n",
                          inode);
-                cinode->clientCanCacheRead = false;
+                cinode->oplock = 0;
         }
         return written;
 }
@@ -2957,7 +2957,7 @@ cifs_strict_readv(struct kiocb *iocb, const struct iovec *iov,
          * on pages affected by this read but not on the region from pos to
          * pos+len-1.
          */
-        if (!cinode->clientCanCacheRead)
+        if (!CIFS_CACHE_READ(cinode))
                 return cifs_user_readv(iocb, iov, nr_segs, pos);
 
         if (cap_unix(tcon->ses) &&
@@ -3093,7 +3093,7 @@ int cifs_file_strict_mmap(struct file *file, struct vm_area_struct *vma)
 
         xid = get_xid();
 
-        if (!CIFS_I(inode)->clientCanCacheRead) {
+        if (!CIFS_CACHE_READ(CIFS_I(inode))) {
                 rc = cifs_invalidate_mapping(inode);
                 if (rc)
                         return rc;
@@ -3526,7 +3526,7 @@ static int cifs_write_begin(struct file *file, struct address_space *mapping,
          * is, when the page lies beyond the EOF, or straddles the EOF
          * and the write will cover all of the existing data.
          */
-        if (CIFS_I(mapping->host)->clientCanCacheRead) {
+        if (CIFS_CACHE_READ(CIFS_I(mapping->host))) {
                 i_size = i_size_read(mapping->host);
                 if (page_start >= i_size ||
                     (offset == 0 && (pos + len) >= i_size)) {
@@ -3609,20 +3609,20 @@ void cifs_oplock_break(struct work_struct *work)
         struct cifs_tcon *tcon = tlink_tcon(cfile->tlink);
         int rc = 0;
 
-        if (!cinode->clientCanCacheAll && cinode->clientCanCacheRead &&
+        if (!CIFS_CACHE_WRITE(cinode) && CIFS_CACHE_READ(cinode) &&
                                                 cifs_has_mand_locks(cinode)) {
                 cifs_dbg(FYI, "Reset oplock to None for inode=%p due to mand locks\n",
                          inode);
-                cinode->clientCanCacheRead = false;
+                cinode->oplock = 0;
         }
 
         if (inode && S_ISREG(inode->i_mode)) {
-                if (cinode->clientCanCacheRead)
+                if (CIFS_CACHE_READ(cinode))
                         break_lease(inode, O_RDONLY);
                 else
                         break_lease(inode, O_WRONLY);
                 rc = filemap_fdatawrite(inode->i_mapping);
-                if (cinode->clientCanCacheRead == 0) {
+                if (!CIFS_CACHE_READ(cinode)) {
                         rc = filemap_fdatawait(inode->i_mapping);
                         mapping_set_error(inode->i_mapping, rc);
                         cifs_invalidate_mapping(inode);