aboutsummaryrefslogtreecommitdiffstats
path: root/fs/cifs/cifsproto.h
diff options
context:
space:
mode:
authorPavel Shilovsky <piastryyy@gmail.com>2011-01-17 12:15:44 -0500
committerSteve French <sfrench@us.ibm.com>2011-01-19 12:52:29 -0500
commit12fed00de963433128b5366a21a55808fab2f756 (patch)
tree2898690f5853027b70eda1bd7f3aeb78fe9af74d /fs/cifs/cifsproto.h
parentc56eb8fb6dccb83d9fe62fd4dc00c834de9bc470 (diff)
CIFS: Fix oplock break handling (try #2)
When we get oplock break notification we should set the appropriate value of OplockLevel field in oplock break acknowledge according to the oplock level held by the client in this time. As we only can have level II oplock or no oplock in the case of oplock break, we should be aware only about clientCanCacheRead field in cifsInodeInfo structure. Also fix bug connected with wrong interpretation of OplockLevel field during oplock break notification processing. Signed-off-by: Pavel Shilovsky <piastryyy@gmail.com> Cc: <stable@kernel.org> Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs/cifsproto.h')
-rw-r--r--fs/cifs/cifsproto.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/cifs/cifsproto.h b/fs/cifs/cifsproto.h
index e6d1481b16c1..95d5dbbb4c7a 100644
--- a/fs/cifs/cifsproto.h
+++ b/fs/cifs/cifsproto.h
@@ -347,7 +347,7 @@ extern int CIFSSMBLock(const int xid, struct cifsTconInfo *tcon,
347 const __u16 netfid, const __u64 len, 347 const __u16 netfid, const __u64 len,
348 const __u64 offset, const __u32 numUnlock, 348 const __u64 offset, const __u32 numUnlock,
349 const __u32 numLock, const __u8 lockType, 349 const __u32 numLock, const __u8 lockType,
350 const bool waitFlag); 350 const bool waitFlag, const __u8 oplock_level);
351extern int CIFSSMBPosixLock(const int xid, struct cifsTconInfo *tcon, 351extern int CIFSSMBPosixLock(const int xid, struct cifsTconInfo *tcon,
352 const __u16 smb_file_id, const int get_flag, 352 const __u16 smb_file_id, const int get_flag,
353 const __u64 len, struct file_lock *, 353 const __u64 len, struct file_lock *,