summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2013-09-03 13:31:27 +0000
committerStefan Metzmacher <metze@samba.org>2013-10-06 13:54:33 +0200
commit41857bd0f73bf294fa98d6e697ac563297b24310 (patch)
tree9f95120b13fc46d82a3cd2da056f9aba43527933
parent4cde5bf1a406e14fcc7a51eba1e337fd1d3c80b3 (diff)
downloadsamba-41857bd0f73bf294fa98d6e697ac563297b24310.tar.gz
samba-41857bd0f73bf294fa98d6e697ac563297b24310.tar.bz2
samba-41857bd0f73bf294fa98d6e697ac563297b24310.zip
smbd: Fix confusing comments
The brlock-check is done in grant_fsp_oplock_type Signed-off-by: Volker Lendecke <vl@samba.org> Reviewed-by: Stefan Metzmacher <metze@samba.org>
-rw-r--r--source3/smbd/open.c3
-rw-r--r--source3/smbd/oplock.c3
2 files changed, 2 insertions, 4 deletions
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 1a86233fd9..858d2befc2 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -2676,8 +2676,7 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn,
status = set_file_oplock(fsp, fsp->oplock_type);
if (!NT_STATUS_IS_OK(status)) {
/*
- * Could not get the kernel oplock or there are byte-range
- * locks on the file.
+ * Could not get the kernel oplock
*/
fsp->oplock_type = NO_OPLOCK;
}
diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c
index 96c451cd11..efb37e17fe 100644
--- a/source3/smbd/oplock.c
+++ b/source3/smbd/oplock.c
@@ -47,8 +47,7 @@ void break_kernel_oplock(struct messaging_context *msg_ctx, files_struct *fsp)
/****************************************************************************
Attempt to set an oplock on a file. Succeeds if kernel oplocks are
- disabled (just sets flags) and no byte-range locks in the file. Returns True
- if oplock set.
+ disabled (just sets flags).
****************************************************************************/
NTSTATUS set_file_oplock(files_struct *fsp, int oplock_type)