summaryrefslogtreecommitdiffstats
path: root/src/server/server.c
diff options
context:
space:
mode:
authorSimon Rettberg2025-10-10 18:13:16 +0200
committerSimon Rettberg2025-12-09 15:33:20 +0100
commit531ba156de326210e4807b701183eaf2f506cf2a (patch)
tree0e732acacce0bde31e95bdf4e2bb272d39ecdd25 /src/server/server.c
parent[SERVER] iscsi: Implement relaying requests to uplink servers (diff)
downloaddnbd3-531ba156de326210e4807b701183eaf2f506cf2a.tar.gz
dnbd3-531ba156de326210e4807b701183eaf2f506cf2a.tar.xz
dnbd3-531ba156de326210e4807b701183eaf2f506cf2a.zip
[SERVER] iscsi refactor: First working version
Work towards simplifying the iscsi implementation has begun. Goals are: - Simpler and easier to understand resource/lifecycle management of allocations - Single-threaded architecture, making locking unnecessary - Moving as many allocations as possible to the stack - Making the call-stack more shallow for easier tracking of code flow
Diffstat (limited to 'src/server/server.c')
-rw-r--r--src/server/server.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/src/server/server.c b/src/server/server.c
index 0bbb417..b91e4ce 100644
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -27,7 +27,6 @@
#include "net.h"
#include "altservers.h"
#include "integrity.h"
-#include "iscsi.h"
#include "threadpool.h"
#include "rpc.h"
#include "fuse.h"
@@ -177,10 +176,6 @@ _Noreturn static void dnbd3_cleanup()
threadpool_waitEmpty();
- // Destroy iSCSI global vector
- iscsi_destroy();
- pthread_rwlock_destroy( &iscsi_globvec_rwlock );
-
// Clean up images
retries = 5;
while ( !image_tryFreeAll() && --retries > 0 ) {
@@ -371,11 +366,6 @@ int main(int argc, char *argv[])
integrity_init();
net_init();
- if ( _iSCSIServer ) {
- if ( (pthread_rwlock_init( &iscsi_globvec_rwlock, NULL ) != 0) || (iscsi_create() < 0) )
- return EXIT_FAILURE;
- }
-
uplink_globalsInit();
rpc_init();
if ( mountDir != NULL && !dfuse_init( "-oallow_other", mountDir ) ) {