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

flexnbd: Remove the server I/O lock as it no longer has any consumers

Browse Source
This commit is contained in:
nick
2013-09-23 10:29:06 +01:00
parent 9a3106f946
commit 150e506780
4 changed files with 4 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/serve.c
View File

@@ -69,8 +69,7 @@ struct server * server_create (
strcpy(out->filename_incomplete, s_file);
strcpy(out->filename_incomplete + strlen(s_file), ".INCOMPLETE");
out->l_io = flexthread_mutex_create();
out->l_acl= flexthread_mutex_create();
out->l_acl = flexthread_mutex_create();
out->l_start_mirror = flexthread_mutex_create();
out->mirror_can_start = 1;
@@ -93,7 +92,6 @@ void server_destroy( struct server * serve )
flexthread_mutex_destroy( serve->l_start_mirror );
flexthread_mutex_destroy( serve->l_acl );
flexthread_mutex_destroy( serve->l_io );
if ( serve->acl ) {
acl_destroy( serve->acl );
@@ -126,30 +124,6 @@ void server_unlink( struct server * serve )
do { NULLCHECK( s ); \
FATAL_IF( 0 != flexthread_mutex_unlock( s->f ), msg ); } while (0)
void server_lock_io( struct server * serve)
{
debug("IO locking");
SERVER_LOCK( serve, l_io, "Problem with I/O lock" );
}
void server_unlock_io( struct server* serve )
{
debug("IO unlocking");
SERVER_UNLOCK( serve, l_io, "Problem with I/O unlock" );
}
/* This is only to be called from error handlers. */
int server_io_locked( struct server * serve )
{
NULLCHECK( serve );
return flexthread_mutex_held( serve->l_io );
}
void server_lock_acl( struct server *serve )
{
debug("ACL locking");