diff options
| author | Pavel Shilovsky <pshilovsky@samba.org> | 2013-09-05 16:11:28 +0400 |
|---|---|---|
| committer | Steve French <smfrench@gmail.com> | 2013-09-09 22:52:05 -0500 |
| commit | 53ef1016fd0e4bab128a24f7fe06b9cdb2afdc31 (patch) | |
| tree | ed65cd590e0b813a3643f20e752483c48c95fa11 /fs/cifs/smb2file.c | |
| parent | 18cceb6a78f46b65df654e8348fa2093b91b30f6 (diff) | |
CIFS: Store lease state itself rather than a mapped oplock value
and separate smb20_operations struct.
Signed-off-by: Pavel Shilovsky <pshilovsky@samba.org>
Signed-off-by: Steve French <smfrench@gmail.com>
Diffstat (limited to 'fs/cifs/smb2file.c')
| -rw-r--r-- | fs/cifs/smb2file.c | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/fs/cifs/smb2file.c b/fs/cifs/smb2file.c index 4564787dc7d..3f17b455083 100644 --- a/fs/cifs/smb2file.c +++ b/fs/cifs/smb2file.c @@ -34,29 +34,6 @@ #include "fscache.h" #include "smb2proto.h" -void -smb2_set_oplock_level(struct cifsInodeInfo *cinode, __u32 oplock) -{ - oplock &= 0xFF; - if (oplock == SMB2_OPLOCK_LEVEL_NOCHANGE) - return; - if (oplock == SMB2_OPLOCK_LEVEL_BATCH) { - cinode->oplock = CIFS_CACHE_READ_FLG | CIFS_CACHE_WRITE_FLG | - CIFS_CACHE_HANDLE_FLG; - cifs_dbg(FYI, "Batch Oplock granted on inode %p\n", - &cinode->vfs_inode); - } else if (oplock == SMB2_OPLOCK_LEVEL_EXCLUSIVE) { - cinode->oplock = CIFS_CACHE_READ_FLG | CIFS_CACHE_WRITE_FLG; - cifs_dbg(FYI, "Exclusive Oplock granted on inode %p\n", - &cinode->vfs_inode); - } else if (oplock == SMB2_OPLOCK_LEVEL_II) { - cinode->oplock = CIFS_CACHE_READ_FLG; - cifs_dbg(FYI, "Level II Oplock granted on inode %p\n", - &cinode->vfs_inode); - } else - cinode->oplock = 0; -} - int smb2_open_file(const unsigned int xid, struct cifs_open_parms *oparms, __u32 *oplock, FILE_ALL_INFO *buf) |