diff options
| author | Stefan Metzmacher <metze@samba.org> | 2014-06-12 08:43:26 +0200 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2014-08-06 12:15:57 +0200 |
| commit | bb8e6d458a55510605da8768a302a81d2c2ce457 (patch) | |
| tree | 97662426f02f2775e1e63fc5555ed3997c53d5c4 /source3/smbd/reply.c | |
| parent | 3805249deb82aaeeec7708069f14250f7bd10836 (diff) | |
| download | samba-bb8e6d458a55510605da8768a302a81d2c2ce457.tar.gz samba-bb8e6d458a55510605da8768a302a81d2c2ce457.tar.xz samba-bb8e6d458a55510605da8768a302a81d2c2ce457.zip | |
s3:smbd: pass smbXsrv_connection to smbd_[un]lock_socket()
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
Autobuild-User(master): Michael Adam <obnox@samba.org>
Autobuild-Date(master): Wed Aug 6 12:15:57 CEST 2014 on sn-devel-104
Diffstat (limited to 'source3/smbd/reply.c')
| -rw-r--r-- | source3/smbd/reply.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index a92e3a7ad2..6c664149b1 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -3166,12 +3166,11 @@ ssize_t sendfile_short_send(struct smbXsrv_connection *xconn, static void reply_readbraw_error(struct smbXsrv_connection *xconn) { - struct smbd_server_connection *sconn = xconn->sconn; char header[4]; SIVAL(header,0,0); - smbd_lock_socket(sconn); + smbd_lock_socket(xconn); if (write_data(xconn->transport.sock,header,4) != 4) { int saved_errno = errno; /* @@ -3186,7 +3185,7 @@ static void reply_readbraw_error(struct smbXsrv_connection *xconn) fail_readraw(); } - smbd_unlock_socket(sconn); + smbd_unlock_socket(xconn); } /**************************************************************************** @@ -4073,9 +4072,9 @@ void reply_read_and_X(struct smb_request *req) /* NT_STATUS_RETRY - fall back to sync read. */ } - smbd_lock_socket(req->sconn); + smbd_lock_socket(req->xconn); send_file_readX(conn, req, fsp, startpos, smb_maxcnt); - smbd_unlock_socket(req->sconn); + smbd_unlock_socket(req->xconn); out: END_PROFILE(SMBreadX); |