sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-08 04:58:40 +03:00
Code

s3: Use "sconn" argument in smbd_[un]lock_socket_internal

Browse Source 
Metze, please check!
This commit is contained in:
Volker Lendecke 2010-06-12 11:06:24 +02:00
parent d7bc5fe734
commit 46a48edcdf
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source3/smbd/process.c
View File

@ -46,19 +46,19 @@ static bool smbd_lock_socket_internal(struct smbd_server_connection *sconn)
{
bool ok;
if (smbd_server_conn->smb1.echo_handler.socket_lock_fd == -1) {
if (sconn->smb1.echo_handler.socket_lock_fd == -1) {
return true;
}
smbd_server_conn->smb1.echo_handler.ref_count++;
sconn->smb1.echo_handler.ref_count++;
if (smbd_server_conn->smb1.echo_handler.ref_count > 1) {
if (sconn->smb1.echo_handler.ref_count > 1) {
return true;
}
DEBUG(10,("pid[%d] wait for socket lock\n", (int)sys_getpid()));
ok = fcntl_lock(smbd_server_conn->smb1.echo_handler.socket_lock_fd,
ok = fcntl_lock(sconn->smb1.echo_handler.socket_lock_fd,
SMB_F_SETLKW, 0, 0, F_WRLCK);
if (!ok) {
return false;
@ -80,17 +80,17 @@ static bool smbd_unlock_socket_internal(struct smbd_server_connection *sconn)
{
bool ok;
if (smbd_server_conn->smb1.echo_handler.socket_lock_fd == -1) {
if (sconn->smb1.echo_handler.socket_lock_fd == -1) {
return true;
}
smbd_server_conn->smb1.echo_handler.ref_count--;
sconn->smb1.echo_handler.ref_count--;
if (smbd_server_conn->smb1.echo_handler.ref_count > 0) {
if (sconn->smb1.echo_handler.ref_count > 0) {
return true;
}
ok = fcntl_lock(smbd_server_conn->smb1.echo_handler.socket_lock_fd,
ok = fcntl_lock(sconn->smb1.echo_handler.socket_lock_fd,
SMB_F_SETLKW, 0, 0, F_UNLCK);
if (!ok) {
return false;