aboutsummaryrefslogtreecommitdiffstats
path: root/fs/cifs/smb2misc.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/cifs/smb2misc.c')
-rw-r--r--fs/cifs/smb2misc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/cifs/smb2misc.c b/fs/cifs/smb2misc.c
index 314bd60f30ce..8d1a8898fd13 100644
--- a/fs/cifs/smb2misc.c
+++ b/fs/cifs/smb2misc.c
@@ -380,9 +380,9 @@ cifs_convert_path_to_utf16(const char *from, struct cifs_sb_info *cifs_sb)
380__le32 380__le32
381smb2_get_lease_state(struct cifsInodeInfo *cinode) 381smb2_get_lease_state(struct cifsInodeInfo *cinode)
382{ 382{
383 if (cinode->clientCanCacheAll) 383 if (CIFS_CACHE_WRITE(cinode))
384 return SMB2_LEASE_WRITE_CACHING | SMB2_LEASE_READ_CACHING; 384 return SMB2_LEASE_WRITE_CACHING | SMB2_LEASE_READ_CACHING;
385 else if (cinode->clientCanCacheRead) 385 else if (CIFS_CACHE_READ(cinode))
386 return SMB2_LEASE_READ_CACHING; 386 return SMB2_LEASE_READ_CACHING;
387 return 0; 387 return 0;
388} 388}
@@ -576,7 +576,7 @@ smb2_is_valid_oplock_break(char *buffer, struct TCP_Server_Info *server)
576 cifs_dbg(FYI, "file id match, oplock break\n"); 576 cifs_dbg(FYI, "file id match, oplock break\n");
577 cinode = CIFS_I(cfile->dentry->d_inode); 577 cinode = CIFS_I(cfile->dentry->d_inode);
578 578
579 if (!cinode->clientCanCacheAll && 579 if (!CIFS_CACHE_WRITE(cinode) &&
580 rsp->OplockLevel == SMB2_OPLOCK_LEVEL_NONE) 580 rsp->OplockLevel == SMB2_OPLOCK_LEVEL_NONE)
581 cfile->oplock_break_cancelled = true; 581 cfile->oplock_break_cancelled = true;
582 else 582 else