diff --git a/[refs] b/[refs] index 5a5edcbd46e4..fbef9c2de3d1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 39db810cb6c1e7d1f2e43ae38b437b7ee72fe815 +refs/heads/master: c19eb71020687e178b9fa564f4a8ac1880f87b10 diff --git a/trunk/fs/cifs/file.c b/trunk/fs/cifs/file.c index f9bd8b83f40e..26fa50858aac 100644 --- a/trunk/fs/cifs/file.c +++ b/trunk/fs/cifs/file.c @@ -767,7 +767,7 @@ int cifs_lock(struct file *file, int cmd, struct file_lock *pfLock) mutex_lock(&fid->lock_mutex); list_for_each_entry_safe(li, tmp, &fid->llist, llist) { if (pfLock->fl_start <= li->offset && - (pflock->fl_start + length) >= + (pfLock->fl_start + length) >= (li->offset + li->length)) { stored_rc = CIFSSMBLock(xid, pTcon, netfid,