git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
[pandora-kernel.git]
/
fs
/
cifs
/
file.c
diff --git
a/fs/cifs/file.c
b/fs/cifs/file.c
index
026b5c5
..
ef455dd
100644
(file)
--- a/
fs/cifs/file.c
+++ b/
fs/cifs/file.c
@@
-650,7
+650,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;