bytemark/flexnbd-c
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move checking for a closed client out of server_lock_io and into client_serve_request

Browse Source
This commit is contained in:
Alex Young
2012-06-06 13:44:38 +01:00
parent 1b289a0e87
commit 16001eb9eb
3 changed files with 19 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/client.c
View File

@@ -298,20 +298,24 @@ int client_serve_request(struct client* client)
{
struct nbd_request request;
int request_err;
if ( !client_read_request( client, &request ) ) { return 1; }
int success = 1;
if ( !client_read_request( client, &request ) ) { return success; }
if ( !client_request_needs_reply( client, request, &request_err ) ) {
return request_err;
}
if ( server_lock_io( client->serve ) ){
client_reply( client, request );
server_unlock_io( client->serve );
server_lock_io( client->serve );
if ( server_detect_closed( client->serve ) ) {
success = 0;
} else {
return 1;
client_reply( client, request );
}
return 0;
server_unlock_io( client->serve );
return success;
}