---

yaml --- r: 24984 b: refs/heads/master c: beb84dc h: refs/heads/master v: v3
git-mirror · Mar 3, 2006 · d562f46 · d562f46
1 parent be2f3c4
commit d562f46
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c6ee60b7c8bbc78e3b1776b2820a7e7f95f8996a
+refs/heads/master: beb84dc8186662b17d5ea510fabb85cb7e266d33
diff --git a/trunk/fs/cifs/file.c b/trunk/fs/cifs/file.c
@@ -698,7 +698,7 @@ int cifs_lock(struct file *file, int cmd, struct file_lock *pfLock)
 			posix_lock_type = CIFS_WRLCK;
 
 		if(numUnlock == 1)
-			posix_lock_type |= CIFS_UNLCK;
+			posix_lock_type = CIFS_UNLCK;
 		else if(numLock == 0) {
 			/* if no lock or unlock then nothing
 			to do since we do not know what it is */