diff options
| author | Pavel Shilovsky <pshilovsky@samba.org> | 2013-09-05 11:01:06 +0200 |
|---|---|---|
| committer | Steve French <smfrench@gmail.com> | 2013-09-09 00:49:17 +0200 |
| commit | 18cceb6a78f46b65df654e8348fa2093b91b30f6 (patch) | |
| tree | d1d1e5468427131f5dc323dd0c92c2fdac443738 /fs/cifs/smb2misc.c | |
| parent | [CIFS] quiet sparse compile warning (diff) | |
| download | linux-18cceb6a78f46b65df654e8348fa2093b91b30f6.tar.xz linux-18cceb6a78f46b65df654e8348fa2093b91b30f6.zip | |
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>
Diffstat (limited to 'fs/cifs/smb2misc.c')
| -rw-r--r-- | fs/cifs/smb2misc.c | 6 |
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) __le32 smb2_get_lease_state(struct cifsInodeInfo *cinode) { - if (cinode->clientCanCacheAll) + if (CIFS_CACHE_WRITE(cinode)) return SMB2_LEASE_WRITE_CACHING | SMB2_LEASE_READ_CACHING; - else if (cinode->clientCanCacheRead) + else if (CIFS_CACHE_READ(cinode)) return SMB2_LEASE_READ_CACHING; return 0; } @@ -576,7 +576,7 @@ smb2_is_valid_oplock_break(char *buffer, struct TCP_Server_Info *server) cifs_dbg(FYI, "file id match, oplock break\n"); cinode = CIFS_I(cfile->dentry->d_inode); - if (!cinode->clientCanCacheAll && + if (!CIFS_CACHE_WRITE(cinode) && rsp->OplockLevel == SMB2_OPLOCK_LEVEL_NONE) cfile->oplock_break_cancelled = true; else |