summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2006-03-04 00:36:34 +0100
committerSteve French <sfrench@us.ibm.com>2006-03-04 00:36:34 +0100
commitbeb84dc8186662b17d5ea510fabb85cb7e266d33 (patch)
treee196f2aa1b55d5cd3ba6dc7a6990979022f6e8fc
parentMerge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git (diff)
downloadlinux-beb84dc8186662b17d5ea510fabb85cb7e266d33.tar.xz
linux-beb84dc8186662b17d5ea510fabb85cb7e266d33.zip
[CIFS] Set correct lock type on new posix unlock call
Signed-off-by: Steve French <sfrench@us.ibm.com>
-rw-r--r--fs/cifs/file.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index 71a30fd76aa8..2c093de26225 100644
--- a/fs/cifs/file.c
+++ b/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 */