--- fs/cifs/file.c

+++ fs/cifs/file.c

@@ -825,12 +825,12 @@ int cifs_lock(struct file *file, int cmd

/* BB we could chain these into one lock request BB */

rc = CIFSSMBLock(xid, tcon, netfid, length, pfLock->fl_start,

- 0, 1, lockType, 0 /* wait flag */ );

+ 0, 1, lockType, 0 /* wait flag */, 0);

if (rc == 0) {

rc = CIFSSMBLock(xid, tcon, netfid, length,

pfLock->fl_start, 1 /* numUnlock */ ,

0 /* numLock */ , lockType,

- 0 /* wait flag */ );

+ 0 /* wait flag */, 0);

pfLock->fl_type = F_UNLCK;

if (rc != 0)

cERROR(1, ("Error unlocking previously locked "

@@ -873,8 +873,8 @@ int cifs_lock(struct file *file, int cmd

if (numLock) {

rc = CIFSSMBLock(xid, tcon, netfid, length,

- pfLock->fl_start,

- 0, numLock, lockType, wait_flag);

+ pfLock->fl_start, 0, numLock, lockType,

+ wait_flag, 0);

if (rc == 0) {

/* For Windows locks we must store them. */

@@ -894,9 +894,9 @@ int cifs_lock(struct file *file, int cmd

(pfLock->fl_start + length) >=

(li->offset + li->length)) {

stored_rc = CIFSSMBLock(xid, tcon,

- netfid,

- li->length, li->offset,

- 1, 0, li->type, false);

+ netfid, li->length,

+ li->offset, 1, 0,

+ li->type, false, 0);

if (stored_rc)

rc = stored_rc;

@@ -2314,7 +2314,8 @@ cifs_oplock_break(struct slow_work *work

*/

if (!cfile->closePend && !cfile->oplock_break_cancelled) {

rc = CIFSSMBLock(0, cifs_sb->tcon, cfile->netfid, 0, 0, 0, 0,

- LOCKING_ANDX_OPLOCK_RELEASE, false);

+ LOCKING_ANDX_OPLOCK_RELEASE, false,

+ cinode->clientCanCacheRead ? 1 : 0);

cFYI(1, ("Oplock release rc = %d", rc));

}

}