git.samba.org
/
ira
/
wip.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
[GLUE] Rsync SAMBA_3_2_0 SVN r25598 in order to create the v3-2-test branch.
[ira/wip.git]
/
source3
/
modules
/
vfs_default.c
diff --git
a/source3/modules/vfs_default.c
b/source3/modules/vfs_default.c
index 76a03e9ffb5d5d7659b4a68a0f8d5115eae2aa27..ca27cf0ac3af4d12567c76a065616c8741fc06fc 100644
(file)
--- a/
source3/modules/vfs_default.c
+++ b/
source3/modules/vfs_default.c
@@
-791,10
+791,6
@@
static BOOL vfswrap_lock(vfs_handle_struct *handle, files_struct *fsp, int fd, i
BOOL result;
START_PROFILE(syscall_fcntl_lock);
-
- /* SMB_VFS_GETLOCK should be used to query lock status. */
- SMB_ASSERT(op != SMB_F_GETLK);
-
result = fcntl_lock(fd, op, offset, count, type);
END_PROFILE(syscall_fcntl_lock);
return result;