Patch 2.6.32.28 to 2.6.32.32
/fs/cifs/cifssmb.c
blob:04b755ae1b38c2f8e43a6f8d1468522c7f56d38c -> blob:4e6dbab84435b6b47bbcbd6b1e04b1a8729b1026
--- fs/cifs/cifssmb.c
+++ fs/cifs/cifssmb.c
@@ -1641,8 +1641,7 @@ int
CIFSSMBLock(const int xid, struct cifsTconInfo *tcon,
const __u16 smb_file_id, const __u64 len,
const __u64 offset, const __u32 numUnlock,
- const __u32 numLock, const __u8 lockType,
- const bool waitFlag, const __u8 oplock_level)
+ const __u32 numLock, const __u8 lockType, const bool waitFlag)
{
int rc = 0;
LOCK_REQ *pSMB = NULL;
@@ -1670,7 +1669,6 @@ CIFSSMBLock(const int xid, struct cifsTc
pSMB->NumberOfLocks = cpu_to_le16(numLock);
pSMB->NumberOfUnlocks = cpu_to_le16(numUnlock);
pSMB->LockType = lockType;
- pSMB->OplockLevel = oplock_level;
pSMB->AndXCommand = 0xFF; /* none */
pSMB->Fid = smb_file_id; /* netfid stays le */