summaryrefslogtreecommitdiff
path: root/source3/include
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2010-04-29 17:08:12 -0700
committerJeremy Allison <jra@samba.org>2010-04-29 17:08:12 -0700
commite90444319c37c413ffc4e3a02531309dfa3ff565 (patch)
treec58c01e8ab952713793780a37399913c6eb65187 /source3/include
parentebf6340bb568f279fc8b94856e01de473bd08575 (diff)
downloadsamba-e90444319c37c413ffc4e3a02531309dfa3ff565.tar.gz
samba-e90444319c37c413ffc4e3a02531309dfa3ff565.tar.bz2
samba-e90444319c37c413ffc4e3a02531309dfa3ff565.zip
Carefully label SMB1-specific locking calls.
Jeremy.
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/proto.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 1eaa008320..929d1ecb32 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -6114,9 +6114,9 @@ bool push_blocking_lock_request( struct byte_range_lock *br_lck,
uint64_t count,
uint32 blocking_pid);
void cancel_pending_lock_requests_by_fid(files_struct *fsp, struct byte_range_lock *br_lck);
-void remove_pending_lock_requests_by_mid(uint64_t mid);
-bool blocking_lock_was_deferred(uint64_t mid);
-struct blocking_lock_record *blocking_lock_cancel(files_struct *fsp,
+void remove_pending_lock_requests_by_mid_smb1(uint64_t mid);
+bool blocking_lock_was_deferred_smb1(uint64_t mid);
+struct blocking_lock_record *blocking_lock_cancel_smb1(files_struct *fsp,
uint32 lock_pid,
uint64_t offset,
uint64_t count,