summaryrefslogtreecommitdiff
path: root/source3/smbd/blocking.c
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2010-06-09 19:12:02 -0700
committerJeremy Allison <jra@samba.org>2010-06-09 19:12:02 -0700
commitd28fa8faab5de5979dcd5535a7cd7095d3233e29 (patch)
tree4649a9beaaede86b7b29371c722897de170259cd /source3/smbd/blocking.c
parent3c0eead9fd0693c81388b42f34fadd503edfe891 (diff)
downloadsamba-d28fa8faab5de5979dcd5535a7cd7095d3233e29.tar.gz
samba-d28fa8faab5de5979dcd5535a7cd7095d3233e29.tar.bz2
samba-d28fa8faab5de5979dcd5535a7cd7095d3233e29.zip
Rename "allow_smb2" -> "using_smb2" and make the usage clearer.
Diffstat (limited to 'source3/smbd/blocking.c')
-rw-r--r--source3/smbd/blocking.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/smbd/blocking.c b/source3/smbd/blocking.c
index da14ce89c9..f2ef4b2aa9 100644
--- a/source3/smbd/blocking.c
+++ b/source3/smbd/blocking.c
@@ -41,7 +41,7 @@ void brl_timeout_fn(struct event_context *event_ctx,
{
struct smbd_server_connection *sconn = smbd_server_conn;
- if (sconn->allow_smb2) {
+ if (sconn->using_smb2) {
SMB_ASSERT(sconn->smb2.locks.brl_timeout == te);
TALLOC_FREE(sconn->smb2.locks.brl_timeout);
} else {
@@ -578,7 +578,7 @@ void cancel_pending_lock_requests_by_fid(files_struct *fsp,
struct smbd_server_connection *sconn = smbd_server_conn;
struct blocking_lock_record *blr, *blr_cancelled, *next = NULL;
- if (sconn->allow_smb2) {
+ if (sconn->using_smb2) {
cancel_pending_lock_requests_by_fid_smb2(fsp,
br_lck,
close_type);
@@ -713,7 +713,7 @@ void process_blocking_lock_queue(void)
struct timeval tv_curr = timeval_current();
struct blocking_lock_record *blr, *next = NULL;
- if (sconn->allow_smb2) {
+ if (sconn->using_smb2) {
process_blocking_lock_queue_smb2(tv_curr);
return;
}