From 0dbeeba62842207aced297738a49576210e7d0d1 Mon Sep 17 00:00:00 2001
From: Steve French <sfrench@us.ibm.com>
Date: Fri, 24 Aug 2007 03:22:48 +0000
Subject: [PATCH] --- yaml --- r: 71542 b: refs/heads/master c:
 c19eb71020687e178b9fa564f4a8ac1880f87b10 h: refs/heads/master v: v3

---
 [refs]               | 2 +-
 trunk/fs/cifs/file.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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,