From eeb6f2032b53c65577fc56b5a3ec022b33ff11fe Mon Sep 17 00:00:00 2001
From: Steve French <smfltc@us.ibm.com>
Date: Fri, 26 Aug 2005 14:42:59 -0500
Subject: [PATCH] --- yaml --- r: 6002 b: refs/heads/master c:
 d634cc15e8f33332038dc9c078beae79f9382ada 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 24af461aefd1..56038edcd08c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fd589e0b662c1ea8cfb1e0d20d60a2510979865b
+refs/heads/master: d634cc15e8f33332038dc9c078beae79f9382ada
diff --git a/trunk/fs/cifs/file.c b/trunk/fs/cifs/file.c
index 30ab70ce5547..3497125189df 100644
--- a/trunk/fs/cifs/file.c
+++ b/trunk/fs/cifs/file.c
@@ -643,7 +643,7 @@ int cifs_lock(struct file *file, int cmd, struct file_lock *pfLock)
 			 netfid, length,
 			 pfLock->fl_start, numUnlock, numLock, lockType,
 			 wait_flag);
-	if (rc == 0 && (pfLock->fl_flags & FL_POSIX))
+	if (pfLock->fl_flags & FL_POSIX)
 		posix_lock_file_wait(file, pfLock);
 	FreeXid(xid);
 	return rc;